Merge branches 'pandora-3.2-aufs', 'pandora-3.2-mru', 'pandora-3.2-picks' and 'pandor...
authorGrazvydas Ignotas <notasas@gmail.com>
Sun, 15 Jan 2012 18:13:06 +0000 (20:13 +0200)
committerGrazvydas Ignotas <notasas@gmail.com>
Sun, 15 Jan 2012 18:13:06 +0000 (20:13 +0200)
commitd348f1694041b0310e42c6a471e97214eb301e91
tree191c213dfbd890d8c61a35e55e88377e54fae44b
parentb5a568608c419615e8d5233610a5623aeaecabe2
parent1901e3bcfbb9571304f05743e8f6694b338cb558
parentcd691980ad3d42daa7ac184e6cef955f303caa6e
parentd93e35a5f7b5b97c320afbce889e6369bd4f0a71
Merge branches 'pandora-3.2-aufs', 'pandora-3.2-mru', 'pandora-3.2-picks' and 'pandora-3.2-pnd' into pandora-3.2
drivers/power/bq27x00_battery.c
drivers/power/twl4030_charger.c
drivers/usb/musb/musb_core.c
drivers/usb/musb/musb_core.h
include/linux/i2c/twl.h