summaryrefslogtreecommitdiffstats
path: root/net/ax25/ax25_uid.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-09-21 01:14:25 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-02 04:39:48 +0200
commit974a847e00cf3ff1695e62b276892137893706ab (patch)
treea9454dc32de4738c463f514c37b35106d1e9b2e9 /net/ax25/ax25_uid.c
parentMerge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/ar... (diff)
downloadlinux-974a847e00cf3ff1695e62b276892137893706ab.tar.xz
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 'net/ax25/ax25_uid.c')
0 files changed, 0 insertions, 0 deletions