diff options
| author | Anton Vorontsov <avorontsov@ru.mvista.com> | 2009-09-23 01:49:27 +0200 |
|---|---|---|
| committer | Anton Vorontsov <avorontsov@ru.mvista.com> | 2009-09-23 01:49:27 +0200 |
| commit | f056878332a91ed984a116bad4e7d49aefff9e6e (patch) | |
| tree | 572f4757c8e7811d45e0be0c2ae529c78fb63441 /Documentation/sound/alsa/hdspm.txt | |
| parent | power_supply: Add driver for the PMU on WM831x PMICs (diff) | |
| parent | Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| download | linux-f056878332a91ed984a116bad4e7d49aefff9e6e.tar.xz linux-f056878332a91ed984a116bad4e7d49aefff9e6e.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/power/wm97xx_battery.c
Diffstat (limited to 'Documentation/sound/alsa/hdspm.txt')
0 files changed, 0 insertions, 0 deletions