]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit - drivers/bluetooth/hci_h4p/fw-ti.c
Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Sun, 16 Dec 2007 00:08:15 +0000 (16:08 -0800)
committerTony Lindgren <tony@atomide.com>
Sun, 16 Dec 2007 00:08:15 +0000 (16:08 -0800)
commit85faa2b7655e0c4cb9c1806bef38f6d7e8a51f89
tree31cf18cc8e44e1172dab29bc05654be39b4914df
parent0ed10653d529abbaf37929323926981f16d03a08
parentda8cadb31b82c9d41fc593c8deab6aa20b162d6b
Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

arch/arm/kernel/entry-armv.S
drivers/i2c/busses/i2c-omap.c
Makefile
drivers/i2c/busses/i2c-omap.c
drivers/input/touchscreen/ads7846.c
drivers/net/smc91x.h