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)
commit56fdd18c7b89a2fac1dfe5d54750c9143867fdc4
treece48eee7d5960936fa6e385320b7a261a8bee071
parent7caf6a49bb17d0377210693af5737563b31aa5ee
parentb87297fb405ef13cac375f202d114323b076a56d
Merge branch 'linus' into core/iommu

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>
Documentation/kernel-parameters.txt