tree 775049f3486be9eed2261515c55abb14bdbc4d73
parent fc818301a8a39fedd7f0a71f878f29130c72193d
parent 5cbc1b6f66313111f64e779bf1df3799bf5c2df8
author Linus Torvalds <torvalds@g5.osdl.org> 1152833849 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1152833849 -0700

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

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] arch/arm/kernel/bios32.c: no need to set isa_bridge
  [ARM] 3729/3: EABI padding rules necessitate the packed attribute of floatx80
  [ARM] 3725/1: sharpsl_pm: warn about wrong temperature
  [ARM] 3723/1: collie charging
  [ARM] 3728/1: Restore missing CPU Hotplug irq helper
  [ARM] 3727/1: fix ucb initialization on collie
  [ARM] Allow Versatile to be built for AB and PB
  [ARM] 3726/1: update {ep93xx,ixp2000,ixp23xx,lpd270,onearm} defconfigs to 2.6.18-rc1
  [ARM] 3721/1: Small cleanup for locomo.c