Merge branch 'master' of https://vcs.maemo.org/git/kernel-power
authorCorey O'Connor <coreyoconnor@gmail.com>
Mon, 30 Aug 2010 20:40:29 +0000 (13:40 -0700)
committerCorey O'Connor <coreyoconnor@gmail.com>
Mon, 30 Aug 2010 20:40:29 +0000 (13:40 -0700)
commit027d3604439f749a14eb3db855a8bb18b510c648
tree29aa457cf886ed5fcd0d1c722b02aed128ede3a6
parent46e019aca0f429c614f4eff14cb6fa728e5b4ad1
parent2c38ef0cdd75ee00e38ef0e95535883ef134b474
Merge branch 'master' of https://vcs.maemo.org/git/kernel-power

Conflicts:
kernel-power-2.6.28/debian/changelog
kernel-power-2.6.28/debian/patches/series
kernel-power-2.6.28/debian/changelog
kernel-power-2.6.28/debian/patches/series