Merge branch 'fujitsu' into release
commit89ae400e3f57c9d60cd4da3501bb09c1502b723c
authorLen Brown <len.brown@intel.com>
Sat, 19 Sep 2009 06:09:50 +0000 (19 02:09 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 19 Sep 2009 06:09:50 +0000 (19 02:09 -0400)
tree66f17d0c2ab6e8667528b54c3ff58b3b5cdc9798
parentbf25400e889dac3f9a3d5a5b77e8ec4c170a5006
parent84a6ce267296dabdf427ea4aff73dc58164863bb
Merge branch 'fujitsu' into release
drivers/platform/x86/Kconfig
drivers/platform/x86/fujitsu-laptop.c