tree 5b4cd07bd86bb3b2a4e249658a50146c867327f8
parent 850a9a4e3c019ce67e3bc29c810ac213ec4c169e
parent 744bfe4c25716a7cfc5690aeab8d572b43d7c916
author Linus Torvalds <torvalds@g5.osdl.org> 1141783336 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1141783336 -0800

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