Skip to content
Commit 06a57f4f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.infradead.org/users/cbou/battery-2.6.33 

* git://git.infradead.org/users/cbou/battery-2.6.33:
  wm97xx_battery: Handle missing platform data gracefully
parents fd48d6c8 12b336a8
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment