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)
commit243e1ef842ef9e24fbf1cc7ddf4fd1c01471544a
treeaf808f66a8a8518c82c0e8189df7ac0d4252f31b
parent7d8c22060555a51c23b9c6a76b97a5e75b5db882
parent42b4e9ee3d1d3b691bcae37f217f08740320c58c
Merge branch 'toshiba-bt' into release
drivers/platform/x86/Kconfig
drivers/platform/x86/Makefile