projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fd48d6c 12b336a)
Merge git://git.infradead.org/users/cbou/battery-2.6.33
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Feb 2010 22:06:15 +0000 (14:06 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Feb 2010 22:06:15 +0000 (14:06 -0800)
* git://git.infradead.org/users/cbou/battery-2.6.33:
  wm97xx_battery: Handle missing platform data gracefully


Trivial merge
John Crispins staging tree