tree b0da76b018547912082946b1f8f210bcd1b745e8
parent e5a7675dd503f778987ba1f181799ba5aadde319
parent 557dca5f48a45df88a73e69ee0700cfd4e2358c9
author Linus Torvalds <torvalds@linux-foundation.org> 1246924074 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1246924074 -0700

Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] amba: fix amba device resources
  [ARM] pgtable: file pte layout documentation
  [ARM] pgtable: swp pte layout documentation, definitions, and check
  [ARM] export __cpu_flush_dcache_page
  [ARM] 5576/1: Update kb9202_defconfig
  [ARM] 5581/1: U300 clock updates
  [ARM] 5579/1: Updated U300 defconfig