Merge branch 'misc' into release
commit3e0fe364835cecc8560cf32bb9609f4c56c5d9fa
authorLen Brown <len.brown@intel.com>
Wed, 12 Nov 2008 02:14:11 +0000 (11 21:14 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 12 Nov 2008 02:14:11 +0000 (11 21:14 -0500)
treebe2236bd4f6f16aee24cca5217449dc03a6c1e85
parente911d27af43e7d28d59a96a4682e8942f0661469
parent32836259ff25ce97010569706cd33ba94de81d62
Merge branch 'misc' into release
Documentation/kernel-parameters.txt
MAINTAINERS
drivers/char/sonypi.c