Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 8 Mar 2006 02:02:16 +0000 (18:02 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 8 Mar 2006 02:02:16 +0000 (18:02 -0800)
commitd423421cb3e924cf68da231a732c3250c80afa4e
tree5b4cd07bd86bb3b2a4e249658a50146c867327f8
parent850a9a4e3c019ce67e3bc29c810ac213ec4c169e
parent744bfe4c25716a7cfc5690aeab8d572b43d7c916
Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 3353/1: NAS100d: protect  nas100d_power_exit() with machine_is_nas100d()
  [ARM] 3352/1: DSB required for the completion of a TLB maintenance operation