]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
git://bbs.cooldavid.org / net-next-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7d8c220 42b4e9e)
Merge branch 'toshiba-bt' into release
authorLen Brown <len.brown@intel.com>
Wed, 16 Dec 2009 18:57:16 +0000 (13:57 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 16 Dec 2009 18:57:16 +0000 (13:57 -0500)
1  2 
drivers/platform/x86/Kconfig patch | diff1 | diff2 | blob | history
drivers/platform/x86/Makefile patch | diff1 | diff2 | blob | history

diff --cc drivers/platform/x86/Kconfig
Simple merge
diff --cc drivers/platform/x86/Makefile
Simple merge
Clone of davem's net-next-2.6 tree