Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 13 Jan 2008 18:03:10 +0000 (10:03 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 13 Jan 2008 18:03:10 +0000 (10:03 -0800)
* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] vfp: fix fuitod/fsitod instructions
  [ARM] pxa: silence warnings from cpu_is_xxx() macros


Trivial merge