git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7caf6a4 b87297f)
Merge branch 'linus' into core/iommu
authorIngo Molnar <mingo@elte.hu>
Sun, 7 Jun 2009 09:34:59 +0000 (11:34 +0200)
committerIngo Molnar <mingo@elte.hu>
Sun, 7 Jun 2009 09:35:05 +0000 (11:35 +0200)
Merge reason: This branch was on an -rc5 base so pull almost-2.6.30
              to resync with the latest upstream fixes and make sure
              the combination works fine.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
Documentation/kernel-parameters.txt patch | diff1 | diff2 | blob | history

diff --cc Documentation/kernel-parameters.txt
Simple merge
Pandora Kernel Repository