Merge branches 'pandora-3.2-aufs', 'pandora-3.2-mru', 'pandora-3.2-picks' and 'pandor...

diff --cc drivers/power/bq27x00_battery.c
Simple merge

diff --cc drivers/power/twl4030_charger.c
Simple merge

diff --cc drivers/usb/musb/musb_core.c
Simple merge

diff --cc drivers/usb/musb/musb_core.h
Simple merge

diff --cc include/linux/i2c/twl.h
Simple merge