git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* git://git.infradead.org/users/cbou/battery-2.6.35:
  ds2782_battery: Rename get_current to fix build failure / name conflict


Trivial merge
Pandora Kernel Repository