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 |
|---|---|---|
| apparmor | ||
| integrity | ||
| keys | ||
| selinux | ||
| smack | ||
| tomoyo | ||
| Kconfig | -rw-r--r-- | 7.9 KB |
| Makefile | -rw-r--r-- | 941 bytes |
| capability.c | -rw-r--r-- | 23.2 KB |
| commoncap.c | -rw-r--r-- | 27.1 KB |
| device_cgroup.c | -rw-r--r-- | 11.5 KB |
| inode.c | -rw-r--r-- | 6.7 KB |
| lsm_audit.c | -rw-r--r-- | 9.0 KB |
| min_addr.c | -rw-r--r-- | 1.3 KB |
| security.c | -rw-r--r-- | 33.1 KB |
Computing file changes ...
