summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-05-03 19:57:57 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-03 19:57:57 +0200
commit38e80121bd7d0c493072442ac7eddcba165a07a8 (patch)
tree66c948222e45b461f9d1b8917b222a0c90af9e6e /Makefile
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes (diff)
parentPMU battery: filenames in sysfs with spaces (diff)
downloadlinux-38e80121bd7d0c493072442ac7eddcba165a07a8.tar.xz
linux-38e80121bd7d0c493072442ac7eddcba165a07a8.zip
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6: PMU battery: filenames in sysfs with spaces pda_power: add init and exit function callbacks
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions