summaryrefslogtreecommitdiffstats
path: root/net/nfc
diff options
context:
space:
mode:
authorLinus Torvalds2012-04-12 23:15:21 +0200
committerLinus Torvalds2012-04-12 23:15:21 +0200
commitecca5c3acc0d0933d89abc44e60afb0cc8170e35 (patch)
treee765a76f8bf07717b4c446193bc4e2601b4fd038 /net/nfc
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
parentpanic: fix stack dump print on direct call to panic() (diff)
downloadkernel-qcow2-linux-ecca5c3acc0d0933d89abc44e60afb0cc8170e35.tar.gz
kernel-qcow2-linux-ecca5c3acc0d0933d89abc44e60afb0cc8170e35.tar.xz
kernel-qcow2-linux-ecca5c3acc0d0933d89abc44e60afb0cc8170e35.zip
Merge branch 'akpm' (Andrew's patch-bomb)
Merge fixes from Andrew Morton. * emailed from Andrew Morton <akpm@linux-foundation.org>: (14 patches) panic: fix stack dump print on direct call to panic() drivers/rtc/rtc-pl031.c: enable clock on all ST variants Revert "mm: vmscan: fix misused nr_reclaimed in shrink_mem_cgroup_zone()" hugetlb: fix race condition in hugetlb_fault() drivers/rtc/rtc-twl.c: use static register while reading time drivers/rtc/rtc-s3c.c: add placeholder for driver private data drivers/rtc/rtc-s3c.c: fix compilation error MAINTAINERS: add PCDP console maintainer memcg: do not open code accesses to res_counter members drivers/rtc/rtc-efi.c: fix section mismatch warning drivers/rtc/rtc-r9701.c: reset registers if invalid values are detected drivers/char/random.c: fix boot id uniqueness race memcg: fix broken boolen expression memcg: fix up documentation on global LRU
Diffstat (limited to 'net/nfc')
0 files changed, 0 insertions, 0 deletions