tree ce48eee7d5960936fa6e385320b7a261a8bee071
parent 7caf6a49bb17d0377210693af5737563b31aa5ee
parent b87297fb405ef13cac375f202d114323b076a56d
author Ingo Molnar <mingo@elte.hu> 1244367299 +0200
committer Ingo Molnar <mingo@elte.hu> 1244367305 +0200

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>