| commit | f056878332a91ed984a116bad4e7d49aefff9e6e | [log] [tgz] |
|---|---|---|
| author | Anton Vorontsov <avorontsov@ru.mvista.com> | Wed Sep 23 03:49:27 2009 +0400 |
| committer | Anton Vorontsov <avorontsov@ru.mvista.com> | Wed Sep 23 03:49:27 2009 +0400 |
| tree | 572f4757c8e7811d45e0be0c2ae529c78fb63441 | |
| parent | 3961f7c3cf247eee5df7fabadc7a40f2deeb98f3 [diff] | |
| parent | 7fa07729e439a6184bd824746d06a49cca553f15 [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 Conflicts: drivers/power/wm97xx_battery.c