Merge branches 'x86/urgent' and 'x86/pat' into x86/core

Browse source

Conflicts:
	arch/x86/include/asm/pat.h

...

This commit is contained in:

Ingo Molnar 2009-02-26 06:31:23 +01:00

parent 13b2eda64d 13093cb0e5

commit 801c0be814

5 changed files with 82 additions and 22 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

5

arch/x86/include/asm/iomap.h

View file

3

arch/x86/include/asm/pat.h

View file

44

arch/x86/mm/iomap_32.c

View file

46

arch/x86/mm/pat.c

View file

6

include/linux/io-mapping.h

View file