| commit | b391738bd1c708fe85592410c6a7c9752689481d | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Dec 08 13:34:17 2009 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Dec 08 13:34:17 2009 -0800 |
| tree | e4a27d1b98725dcc42eae65f72a9ac4375420faa | |
| parent | e33c01972239fee4696679ae5f7d1f340f424999 [diff] | |
| parent | 2fb8f4e6a83dcaec15c1dd0ee8a6f618e7ece7f0 [diff] |
Merge branch 'x86-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: pat: Remove ioremap_default() x86: pat: Clean up req_type special case for reserve_memtype() x86: Relegate CONFIG_PAT and CONFIG_MTRR configurability to EMBEDDED