]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit - drivers/cbus/cbus.c
Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Wed, 28 Nov 2007 22:06:26 +0000 (14:06 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 28 Nov 2007 22:06:26 +0000 (14:06 -0800)
commit88282ad97860951c39585a1e3dd4cf36d898c4f8
tree5645b5cdfb2da0fb5c9d9edebf411f5b281f7741
parentb3b20c6fc4ab4426ec4960f275a3b72878e58078
parenta531a141089714efe39eca89593524fdf05104f2
Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'
drivers/input/keyboard/Kconfig
drivers/rtc/Kconfig
drivers/spi/Kconfig