Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 17 Nov 2007 02:32:08 +0000 (18:32 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 17 Nov 2007 02:32:08 +0000 (18:32 -0800)
commit0048e1c44a4529d4ea93e6920fa5468730c68c94
treeb5d93514eee9cea4e5d0b933b604e8bb95e7655e
parent4c5cdb1e1f2a502069f57a60b5c6b97b8106c73c
parent2a0d7187340ca192ccc061a86c8a55be5e7627f0
Merge branch 'for-linus' of /home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 4638/1: pxa: use PXA3xx specific macros to define clks
  [ARM] remove useless setting of VM_RESERVED