]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
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
drivers/platform/x86/Makefile

Simple merge
Simple merge