Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@woody.osdl.org>
Wed, 29 Nov 2006 21:44:00 +0000 (13:44 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Wed, 29 Nov 2006 21:44:00 +0000 (13:44 -0800)
commitaf768c6711de615abf9c679732a2f8245a4c286c
tree326f064955adb4a40045fa2a23ca6b358cd26bcb
parentf5d6c63a67a8f124ddae88511427249d1dd87880
parentaed6fad8beca30a71a6950b6f650822254efa8c6
Merge branch 'for-linus' of /home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 3943/1: share declaration of struct pxa2xx_udc_mach_info between multiple platforms
  [ARM] Export smp_call_function()
  [ARM] Add PM_LEGACY defaults