projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bf87eae bbabb15)
Merge git://git.infradead.org/battery-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 May 2010 15:16:34 +0000 (08:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 May 2010 15:16:34 +0000 (08:16 -0700)
* git://git.infradead.org/battery-2.6:
  power_supply: Fix regression for 'type' property


Trivial merge
John Crispins staging tree