summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-12-26 23:05:07 +0100
committerLen Brown <len.brown@intel.com>2010-12-26 23:05:07 +0100
commitbbbcde9d9614683fbeb41f00728cfbfb7f75a7ad (patch)
treeaa085801b7b1203c171c7f999d0a26a4105ba4ec /drivers
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
parentACPI / ACPICA: Disable GPEs during initialization (diff)
parentRevert "ACPI battery: update status upon sysfs query" (diff)
downloadlinux-bbbcde9d9614683fbeb41f00728cfbfb7f75a7ad.tar.xz
linux-bbbcde9d9614683fbeb41f00728cfbfb7f75a7ad.zip
Merge branches 'bugzilla-25412' and 'bugzilla-25302' into release