git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3eb208f
eb03cb0
d7f6169
e410829
bb0c5ed
aa16597
4996c02
6c8111e
)
Merge branches 'acpica', 'battery', 'boot-irqs', 'bz-24492', 'bz-9528', 'from-akpm...
author
Len Brown
<len.brown@intel.com>
Tue, 2 Aug 2011 21:22:09 +0000
(17:22 -0400)
committer
Len Brown
<len.brown@intel.com>
Tue, 2 Aug 2011 21:22:09 +0000
(17:22 -0400)
Conflicts:
Documentation/kernel-parameters.txt
Signed-off-by: Len Brown <len.brown@intel.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff