]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: a376bca eb9650d)
Merge git://git.infradead.org/users/cbou/battery-2.6.35
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Jul 2010 16:22:55 +0000 (09:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Jul 2010 16:22:55 +0000 (09:22 -0700)
commit02e7cce2bc3ac82b971d1efe489f23ca0b6e1d4a
tree8a2579a63dafc1e7a47c0d9281e315dd6d9568d7tree
parenta376bca61096c7a79393e8125b7ad4757ccff19ccommit | diff
parenteb9650d6d989f24f21232a055d8fd45f1a9dcf99commit | diff
Merge git://git.infradead.org/users/cbou/battery-2.6.35

* git://git.infradead.org/users/cbou/battery-2.6.35:
  ds2782_battery: Rename get_current to fix build failure / name conflict
drivers/power/ds2782_battery.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.