Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 24 Apr 2007 16:36:53 +0000 (09:36 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 24 Apr 2007 16:36:53 +0000 (09:36 -0700)
commitd80a7920731a964b8c3492667a8069e5385ec794
tree939624f80222654f52dcf54a08efc7903db03317
parent32bd33e21eeab63e7265bb3cba9ed94ab1ab816e
parent8689b517be3e3f65f8ba20490beccca13c5879fa
Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6

* 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6:
  [PATCH] i386: Fix some warnings added by earlier patch
  [PATCH] x86-64: Always flush all pages in change_page_attr
  [PATCH] x86: Remove noreplacement option
  [PATCH] x86-64: make GART PTEs uncacheable