summaryrefslogtreecommitdiffstats
path: root/drivers/platform/x86/sony-laptop.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-25 08:16:34 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-25 08:16:34 -0700
commit4961ab934a1254b1ad9420cea0ded617b57f022b (patch)
treef48ee16ff167f1b54ef6608986ba8155194610b4 /drivers/platform/x86/sony-laptop.c
parentbf87eae94880f1b79c2828d8705f0d97e961f168 (diff)
parentbbabb158f0e9d41174ae5c2183a8e4f981daf6ce (diff)
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6: power_supply: Fix regression for 'type' property
Diffstat (limited to 'drivers/platform/x86/sony-laptop.c')
0 files changed, 0 insertions, 0 deletions