Revision 511f1cb6d426938fabf9c6d69ce4861b66ffd919 authored by Arnd Bergmann on 24 March 2012, 11:29:58 UTC, committed by Arnd Bergmann on 24 March 2012, 11:29:58 UTC
The pxa regulator branch removes the bq24022 driver, while a lot of other regulator drivers got added in the regulator tree. This resolves the trivial conflicts by merging in the regulator patches that are already merged into v3.4. Conflicts: drivers/regulator/Kconfig drivers/regulator/Makefile Signed-off-by: Arnd Bergmann <arnd@arndb.de>
File | Mode | Size |
---|---|---|
hidraw | ||
hw_breakpoint | ||
kdb | ||
kfifo | ||
kobject | ||
kprobes | ||
trace_events | ||
tracepoints | ||
Kconfig | -rw-r--r-- | 1.7 KB |
Makefile | -rw-r--r-- | 148 bytes |
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...