diff options
| author | Olof Johansson | 2012-09-21 01:14:25 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2012-10-02 04:39:48 +0200 |
| commit | 974a847e00cf3ff1695e62b276892137893706ab (patch) | |
| tree | a9454dc32de4738c463f514c37b35106d1e9b2e9 /Documentation/security/Smack.txt | |
| parent | Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/ar... (diff) | |
| download | kernel-qcow2-linux-974a847e00cf3ff1695e62b276892137893706ab.tar.gz kernel-qcow2-linux-974a847e00cf3ff1695e62b276892137893706ab.tar.xz kernel-qcow2-linux-974a847e00cf3ff1695e62b276892137893706ab.zip | |
drivers: bus: omap_l3: fixup merge conflict resolution
This fixes a local merge conflict resolution done wrong locally in
arm-soc for-next. soc.h was added on a cleanup branch, but the driver
was moved and the header no longer needed.
Signed-off-by: Olof Johansson <olof@lixom.net>
[ .. and I did the same wrong merge, since git automatically does the
whole rename detection etc, so applying this patch from Olof - Linus ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Documentation/security/Smack.txt')
0 files changed, 0 insertions, 0 deletions