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

This adds the missing arch/arm/lib/bitops.h file.