Merge branch 'pnp-debug' into test
commit4dff4e7f6cbcd2722b02dbb394ba87c4e05f8841
authorLen Brown <len.brown@intel.com>
Thu, 23 Oct 2008 03:28:43 +0000 (22 23:28 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 23 Oct 2008 03:28:43 +0000 (22 23:28 -0400)
tree2b80f6f9d3b5b1ff4600810c4a30917b2d66b7ab
parent5f50ef453dcb05115fc98f244b8f10bfacd4b8b7
parentac88a8f3f7df04774b386ddaf586040adb819b58
Merge branch 'pnp-debug' into test
Documentation/kernel-parameters.txt
drivers/pnp/pnpacpi/core.c