]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit
Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Mon, 9 Feb 2009 21:05:28 +0000 (13:05 -0800)
committerTony Lindgren <tony@atomide.com>
Mon, 9 Feb 2009 21:05:28 +0000 (13:05 -0800)
commit70ff4a1aafd2378c9e3ff153135ba6d0bde45215
tree3e798c1752e156379b2bfe8fc6127eea81526a48
parent8e722f8aec1735a912e2c63e0a8be9e4fdc8597a
parentd5b562330ec766292a3ac54ae5e0673610bd5b3d
Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

arch/arm/mach-omap2/irq.c
arch/arm/plat-omap/devices.c
arch/arm/plat-omap/dma.c
Makefile
arch/arm/mach-omap1/devices.c
arch/arm/mach-omap2/devices.c
arch/arm/mach-omap2/irq.c
arch/arm/plat-omap/devices.c
arch/arm/plat-omap/include/mach/mmc.h
drivers/misc/Kconfig
drivers/mmc/host/Kconfig