summaryrefslogtreecommitdiffstats
path: root/kernel/power/user.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-02-21 09:15:39 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-02-21 09:15:39 -0800
commit460c1338fc05add0e8050d4945a46f207b13a5fc (patch)
tree5dfbf43f2b777db060409085cdecc4c0087586da /kernel/power/user.c
parent710320d57999016729da7c9cfee017b276f553bc (diff)
parentcc3ca22063784076bd240fda87217387a8f2ae92 (diff)
downloadop-kernel-dev-460c1338fc05add0e8050d4945a46f207b13a5fc.zip
op-kernel-dev-460c1338fc05add0e8050d4945a46f207b13a5fc.tar.gz
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, mce: remove incorrect __cpuinit for mce_cpu_features() MAINTAINERS: paravirt-ops maintainers update
Diffstat (limited to 'kernel/power/user.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud