#
c18ab0ba |
| 10-Jan-2013 |
Takashi Iwai <tiwai@suse.de> |
Merge tag 'asoc-fix-3.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.8
Nothing terribly exciting here except for the DOUBLE_RANGE fix which
Merge tag 'asoc-fix-3.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.8
Nothing terribly exciting here except for the DOUBLE_RANGE fix which just hadn't worked before, nobody noticed due to lack of use.
show more ...
|
#
49569646 |
| 03-Jan-2013 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge tag 'driver-core-3.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core __dev* removal patches - take 3 - from Greg Kroah-Hartman: "Here are the remaini
Merge tag 'driver-core-3.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core __dev* removal patches - take 3 - from Greg Kroah-Hartman: "Here are the remaining __dev* removal patches against the 3.8-rc2 tree. All of these patches were previously sent to the subsystem maintainers, most of them were picked up and pushed to you, but there were a number that fell through the cracks, and new drivers were added during the merge window, so this series cleans up the rest of the instances of these markings.
Third time's the charm...
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
Fixed up trivial conflict with the pinctrl pull in pinctrl-sirf.c.
* tag 'driver-core-3.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (54 commits) misc: remove __dev* attributes. include: remove __dev* attributes. Documentation: remove __dev* attributes. Drivers: misc: remove __dev* attributes. Drivers: block: remove __dev* attributes. Drivers: bcma: remove __dev* attributes. Drivers: char: remove __dev* attributes. Drivers: clocksource: remove __dev* attributes. Drivers: ssb: remove __dev* attributes. Drivers: dma: remove __dev* attributes. Drivers: gpu: remove __dev* attributes. Drivers: infinband: remove __dev* attributes. Drivers: memory: remove __dev* attributes. Drivers: mmc: remove __dev* attributes. Drivers: iommu: remove __dev* attributes. Drivers: power: remove __dev* attributes. Drivers: message: remove __dev* attributes. Drivers: macintosh: remove __dev* attributes. Drivers: mfd: remove __dev* attributes. pstore: remove __dev* attributes. ...
show more ...
|
Revision tags: v3.8-rc1 |
|
#
7c9503b8 |
| 21-Dec-2012 |
Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
SPARC: drivers: remove __dev* attributes.
CONFIG_HOTPLUG is going away as an option. As a result, the __dev* markings need to be removed.
This change removes the use of __devinit, __devexit_p, __d
SPARC: drivers: remove __dev* attributes.
CONFIG_HOTPLUG is going away as an option. As a result, the __dev* markings need to be removed.
This change removes the use of __devinit, __devexit_p, __devinitdata, and __devexit from these drivers.
Based on patches originally written by Bill Pemberton, but redone by me in order to handle some of the coding style issues better, by hand.
Cc: Bill Pemberton <wfp5p@virginia.edu> Cc: "David S. Miller" <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
show more ...
|
Revision tags: v3.7, v3.7-rc8, v3.7-rc7, v3.7-rc6, v3.7-rc5, v3.7-rc4, v3.7-rc3, v3.7-rc2, v3.7-rc1, v3.6, v3.6-rc7, v3.6-rc6, v3.6-rc5, v3.6-rc4, v3.6-rc3, v3.6-rc2, v3.6-rc1, v3.5, v3.5-rc7, v3.5-rc6, v3.5-rc5, v3.5-rc4, v3.5-rc3, v3.5-rc2, v3.5-rc1, v3.4, v3.4-rc7, v3.4-rc6, v3.4-rc5, v3.4-rc4, v3.4-rc3, v3.4-rc2, v3.4-rc1, v3.3, v3.3-rc7, v3.3-rc6, v3.3-rc5, v3.3-rc4, v3.3-rc3, v3.3-rc2, v3.3-rc1, v3.2, v3.2-rc7, v3.2-rc6, v3.2-rc5, v3.2-rc4, v3.2-rc3, v3.2-rc2, v3.2-rc1, v3.1, v3.1-rc10, v3.1-rc9, v3.1-rc8, v3.1-rc7, v3.1-rc6, v3.1-rc5, v3.1-rc4, v3.1-rc3 |
|
#
99b1bb61 |
| 21-Aug-2011 |
Joel Becker <jlbec@evilplan.org> |
Merge branch 'mw-3.1-jul25' of git://oss.oracle.com/git/smushran/linux-2.6 into ocfs2-fixes
|
#
94bd217e |
| 17-Aug-2011 |
Florian Tobias Schandinat <FlorianSchandinat@gmx.de> |
Merge commit 'v3.1-rc2' into HEAD
|
#
2d9f8a6e |
| 15-Aug-2011 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'fix/hda' into topic/hda
|
Revision tags: v3.1-rc2 |
|
#
0a2d31b6 |
| 08-Aug-2011 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'fix/kconfig' into for-linus
|
#
2ddb4e94 |
| 08-Aug-2011 |
Alex Elder <aelder@sgi.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
|
#
8c285645 |
| 08-Aug-2011 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'wm8996-rename' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc
|
#
18d4ed43 |
| 08-Aug-2011 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge branch 'for-3.1' into for-3.2
Conflict due to the fix for the register map failure - taken the for-3.1 version.
Conflicts: sound/soc/codecs/sgtl5000.c
|
Revision tags: v3.1-rc1 |
|
#
17b04360 |
| 04-Aug-2011 |
H. Peter Anvin <hpa@linux.intel.com> |
Merge commit 'v3.0' into x86/vdso
|
#
3d071cd3 |
| 02-Aug-2011 |
Chris Metcalf <cmetcalf@tilera.com> |
Merge tag 'v3.0' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
|
#
aa7eb8e7 |
| 27-Jul-2011 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge branch 'next' into for-linus
|
#
a91f423e |
| 22-Jul-2011 |
Jiri Kosina <jkosina@suse.cz> |
Merge branches 'roccat', 'upstream' and 'wiimote' into for-linus
|
Revision tags: v3.0, v3.0-rc7 |
|
#
0c9e98af |
| 05-Jul-2011 |
Greg Kroah-Hartman <gregkh@suse.de> |
Merge Linux 3.0-rc6 into staging-next
This handles the merge conflicts with the drivers/staging/brcm80211/Kconfig file due to changes on the two different branches.
Signed-off-by: Greg Kroah-Hartma
Merge Linux 3.0-rc6 into staging-next
This handles the merge conflicts with the drivers/staging/brcm80211/Kconfig file due to changes on the two different branches.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
show more ...
|
Revision tags: v3.0-rc6 |
|
#
04bf7869 |
| 01-Jul-2011 |
Jens Axboe <jaxboe@fusionio.com> |
Merge branch 'for-linus' into for-3.1/core
Conflicts: block/blk-throttle.c block/cfq-iosched.c
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
|
#
36b2e922 |
| 01-Jul-2011 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v3.0-rc5' into sched/core
Merge reason: Move to a (much) newer base.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
5b944a71 |
| 30-Jun-2011 |
James Morris <jmorris@namei.org> |
Merge branch 'linus' into next
|
#
6da49a29 |
| 30-Jun-2011 |
Benjamin Herrenschmidt <benh@kernel.crashing.org> |
Merge remote branch 'origin/master' into next
|
Revision tags: v3.0-rc5 |
|
#
74d83b7e |
| 23-Jun-2011 |
Nicholas Bellinger <nab@linux-iscsi.org> |
Merge tag 'v3.0-rc4' of /pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
|
#
2cd1176b |
| 21-Jun-2011 |
Keith Packard <keithp@keithp.com> |
Merge branch 'drm-intel-fixes' into drm-intel-next
|
#
9f6ec8d6 |
| 21-Jun-2011 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/wireless/iwlwifi/iwl-agn-rxon.c drivers/net/wireless/rtlwifi/pci.c net/netfilter/ipvs/ip_
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/wireless/iwlwifi/iwl-agn-rxon.c drivers/net/wireless/rtlwifi/pci.c net/netfilter/ipvs/ip_vs_core.c
show more ...
|
Revision tags: v3.0-rc4 |
|
#
f8db4cc4 |
| 17-Jun-2011 |
Grant Likely <grant.likely@secretlab.ca> |
Merge branch 'spi/merge' into spi/next
|
#
b4f9f2b6 |
| 16-Jun-2011 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v3.0-rc3' into perf/core
Merge reason: add the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
2bc7c852 |
| 15-Jun-2011 |
Grant Likely <grant.likely@secretlab.ca> |
Merge branch 'gpio/next-tegra' into gpio/next
Conflicts: drivers/gpio/Kconfig drivers/gpio/Makefile
|