summaryrefslogtreecommitdiffstats
path: root/net/nfc/nci
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-01-09 08:58:57 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-01-09 08:58:57 -0800
commit5c49985c21bba4d2f899e3a97121868a5c58a876 (patch)
treef877cde6c0effa6c8cd6e1d0d7e116358eb41ee8 /net/nfc/nci
parent57a0c1e2d6cb70ad0f8549ae730fc58fd0553429 (diff)
parent8a3a180d21793f2e4386b3cb61c48322564fc80a (diff)
downloadlinux-5c49985c21bba4d2f899e3a97121868a5c58a876.tar.bz2
Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
Pull ARM fixes from Russell King. * 'fixes' of git://git.linaro.org/people/rmk/linux-arm: ARM: 7616/1: cache-l2x0: aurora: Use writel_relaxed instead of writel ARM: 7615/1: cache-l2x0: aurora: Invalidate during clean operation with WT enable ARM: 7614/1: mm: fix wrong branch from Cortex-A9 to PJ4b ARM: 7612/1: imx: Do not select some errata that depends on !ARCH_MULTIPLATFORM ARM: 7611/1: VIC: fix bug in VIC irqdomain code ARM: 7610/1: versatile: bump IRQ numbers ARM: 7609/1: disable errata work-arounds which access secure registers ARM: 7608/1: l2x0: Only set .set_debug on PL310 r3p0 and earlier
Diffstat (limited to 'net/nfc/nci')
0 files changed, 0 insertions, 0 deletions