git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c027a47
c3e6088
)
Merge branch 'apei' into apei-release
author
Len Brown
<len.brown@intel.com>
Wed, 3 Aug 2011 15:30:42 +0000
(11:30 -0400)
committer
Len Brown
<len.brown@intel.com>
Wed, 3 Aug 2011 15:30:42 +0000
(11:30 -0400)
Some trivial conflicts due to other various merges
adding to the end of common lists sooner than this one.
arch/ia64/Kconfig
arch/powerpc/Kconfig
arch/x86/Kconfig
lib/Kconfig
lib/Makefile
Signed-off-by: Len Brown <len.brown@intel.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff