Merge git://git.infradead.org/battery-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 23 Sep 2007 20:04:01 +0000 (13:04 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 23 Sep 2007 20:04:01 +0000 (13:04 -0700)
commit562b4b632c9639cc36e09b2dec32c6b3ca65ca03
treea512d0ee87f92941b5f7de641a44c293441812e3
parentb7e113dc9d52c4a37d2da6fafe77959f3a28eccf
parented2ba977d43a6031f78f9e49d739ef5094f512e4
Merge git://git.infradead.org/battery-2.6

* git://git.infradead.org/battery-2.6:
  [PATCH] missing null termination in power supply uevent