Merge branch 'i2c-for-2630-v2' of git://aeryn.fluff.org.uk/bjdooks/linux
[pandora-kernel.git] / kernel / posix-cpu-timers.c
Simple merge