]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit - arch/arm/mach-omap2/board-n800-usb.c
Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Wed, 23 Apr 2008 23:26:05 +0000 (16:26 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 23 Apr 2008 23:26:05 +0000 (16:26 -0700)
commitc310c979c4159067685faf37a96ecb0f4d7c0300
tree68ebbb58c2cb7accba2eea5718652f2f4fa85a09
parent9fc4e5b78557b728eadedb9a9688646691f86808
parent3dc5063786b273f1aee545844f6bd4e9651ebffe
Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

drivers/i2c/chips/isp1301_omap.c
drivers/i2c/busses/Makefile
drivers/i2c/busses/i2c-omap.c
drivers/i2c/chips/isp1301_omap.c
drivers/leds/Kconfig
drivers/misc/Kconfig
drivers/misc/Makefile