| #
300a103d |
| 16-Aug-2010 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
e4862f2f |
| 16-Aug-2010 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge branch 'for-2.6.36' into for-2.6.37
Fairly simple conflicts, the most serious ones are the i.MX ones which I
suspect now need another rename.
Conflicts:
arch/arm/mach-mx2/clock_imx27.c
arch
Merge branch 'for-2.6.36' into for-2.6.37
Fairly simple conflicts, the most serious ones are the i.MX ones which I
suspect now need another rename.
Conflicts:
arch/arm/mach-mx2/clock_imx27.c
arch/arm/mach-mx2/devices.c
arch/arm/mach-omap2/board-rx51-peripherals.c
arch/arm/mach-omap2/board-zoom2.c
sound/soc/fsl/mpc5200_dma.c
sound/soc/fsl/mpc5200_dma.h
sound/soc/fsl/mpc8610_hpcd.c
sound/soc/pxa/spitz.c
show more ...
|
| #
bbcf6e8b |
| 15-Aug-2010 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/sh/include/asm/Kbuild
drivers/Makefile
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
|
|
Revision tags: v2.6.36-rc1 |
|
| #
95ee46aa |
| 15-Aug-2010 |
Len Brown <len.brown@intel.com> |
Merge branch 'linus' into release
Conflicts:
drivers/acpi/debug.c
Signed-off-by: Len Brown <len.brown@intel.com>
|
| #
7d72e6fa |
| 13-Aug-2010 |
Chris Metcalf <cmetcalf@tilera.com> |
Merge branch 'master' into for-linus
|
| #
f46a6804 |
| 12-Aug-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into perf/urgent
Merge reason: Fix upstream breakage introduced by:
de5d9bf: Move list types from <linux/list.h> to <linux/types.h>.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
58d4ea65 |
| 12-Aug-2010 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6:
mmc_spi: Fix unterminated of_match_table
of/sparc: fix build r
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6:
mmc_spi: Fix unterminated of_match_table
of/sparc: fix build regression from of_device changes
of/device: Replace struct of_device with struct platform_device
show more ...
|
| #
2dc11581 |
| 06-Aug-2010 |
Grant Likely <grant.likely@secretlab.ca> |
of/device: Replace struct of_device with struct platform_device
of_device is just an alias for platform_device, so remove it entirely. Also
replace to_of_device() with to_platform_device() and upda
of/device: Replace struct of_device with struct platform_device
of_device is just an alias for platform_device, so remove it entirely. Also
replace to_of_device() with to_platform_device() and update comment blocks.
This patch was initially generated from the following semantic patch, and then
edited by hand to pick up the bits that coccinelle didn't catch.
@@
@@
-struct of_device
+struct platform_device
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Reviewed-by: David S. Miller <davem@davemloft.net>
show more ...
|
|
Revision tags: v2.6.35, v2.6.35-rc6, v2.6.35-rc5, v2.6.35-rc4, v2.6.35-rc3, v2.6.35-rc2, v2.6.35-rc1, v2.6.34, v2.6.34-rc7, v2.6.34-rc6, v2.6.34-rc5, v2.6.34-rc4, v2.6.34-rc3, v2.6.34-rc2, v2.6.34-rc1, v2.6.33, v2.6.33-rc8, v2.6.33-rc7, v2.6.33-rc6, v2.6.33-rc5, v2.6.33-rc4, v2.6.33-rc3, v2.6.33-rc2, v2.6.33-rc1, v2.6.32, v2.6.32-rc8, v2.6.32-rc7, v2.6.32-rc6, v2.6.32-rc5, v2.6.32-rc4, v2.6.32-rc3, v2.6.32-rc1, v2.6.32-rc2, v2.6.31, v2.6.31-rc9, v2.6.31-rc8, v2.6.31-rc7, v2.6.31-rc6, v2.6.31-rc5, v2.6.31-rc4, v2.6.31-rc3, v2.6.31-rc2, v2.6.31-rc1, v2.6.30, v2.6.30-rc8, v2.6.30-rc7, v2.6.30-rc6, v2.6.30-rc5, v2.6.30-rc4, v2.6.30-rc3, v2.6.30-rc2, v2.6.30-rc1, v2.6.29, v2.6.29-rc8, v2.6.29-rc7, v2.6.29-rc6, v2.6.29-rc5, v2.6.29-rc4, v2.6.29-rc3, v2.6.29-rc2, v2.6.29-rc1, v2.6.28, v2.6.28-rc9, v2.6.28-rc8, v2.6.28-rc7, v2.6.28-rc6, v2.6.28-rc5, v2.6.28-rc4, v2.6.28-rc3 |
|
| #
7a9787e1 |
| 28-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks
|
|
Revision tags: v2.6.28-rc2, v2.6.28-rc1 |
|
| #
b2aaf8f7 |
| 15-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into stackprotector
Conflicts:
arch/x86/kernel/Makefile
include/asm-x86/pda.h
|
|
Revision tags: v2.6.27, v2.6.27-rc9 |
|
| #
d6d5aeb6 |
| 02-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc8' into genirq
|
| #
f68ec0c2 |
| 03-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc8' into x86/setup
|
|
Revision tags: v2.6.27-rc8, v2.6.27-rc7, v2.6.27-rc6, v2.6.27-rc5, v2.6.27-rc4, v2.6.27-rc3 |
|
| #
c4c0c56a |
| 11-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/rcu
|
| #
e4ddcb0a |
| 08-Aug-2008 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge commit 'v2.6.27-rc1' into for-linus
|
| #
af7a5356 |
| 08-Aug-2008 |
Ben Dooks <ben-linux@fluff.org> |
Merge http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into for-rmk
|
|
Revision tags: v2.6.27-rc2 |
|
| #
85e9ca33 |
| 31-Jul-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into timers/hpet
|
| #
bc588df7 |
| 30-Jul-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'x86/core' into x86/xsave
|
| #
9fec6060 |
| 29-Jul-2008 |
Anton Vorontsov <cbouatmailru@gmail.com> |
Merge branch 'master' of /home/cbou/linux-2.6
Conflicts:
drivers/power/Kconfig
drivers/power/Makefile
|
|
Revision tags: v2.6.27-rc1 |
|
| #
cb28a1bb |
| 28-Jul-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/generic-dma-coherent
Conflicts:
arch/x86/Kconfig
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
eda3d8f5 |
| 27-Jul-2008 |
Haavard Skinnemoen <haavard.skinnemoen@atmel.com> |
Merge commit 'upstream/master'
|
| #
ff877ea8 |
| 25-Jul-2008 |
David Woodhouse <David.Woodhouse@intel.com> |
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
|
| #
0e2f65ee |
| 25-Jul-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/pebs
Conflicts:
arch/x86/Kconfig.cpu
arch/x86/kernel/cpu/intel.c
arch/x86/kernel/setup_64.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
28afe961 |
| 24-Jul-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into tracing/urgent
|
| #
a4e0d9af |
| 23-Jul-2008 |
Mauro Carvalho Chehab <mchehab@infradead.org> |
Merge ../linux-2.6
|
| #
9063974c |
| 23-Jul-2008 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|