summaryrefslogtreecommitdiff
path: root/arch/parisc/include/asm/perf_event.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-08-21 17:22:22 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-08-21 17:22:22 -0700
commit23dcfa61bac244e1200ff9ad19c6e9144dcb6bb5 (patch)
tree4033d868fe120f7778a6180a8eda60842309b665 /arch/parisc/include/asm/perf_event.h
parenta484147a52e6910d990ae7cf2a5d16b5bc58dcbe (diff)
parentc67fe3752abe6ab47639e2f9b836900c3dc3da84 (diff)
Merge branch 'akpm' (Andrew's patch-bomb)
Merge fixes from Andrew Morton. Random drivers and some VM fixes. * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (17 commits) mm: compaction: Abort async compaction if locks are contended or taking too long mm: have order > 0 compaction start near a pageblock with free pages rapidio/tsi721: fix unused variable compiler warning rapidio/tsi721: fix inbound doorbell interrupt handling drivers/rtc/rtc-rs5c348.c: fix hour decoding in 12-hour mode mm: correct page->pfmemalloc to fix deactivate_slab regression drivers/rtc/rtc-pcf2123.c: initialize dynamic sysfs attributes mm/compaction.c: fix deferring compaction mistake drivers/misc/sgi-xp/xpc_uv.c: SGI XPC fails to load when cpu 0 is out of IRQ resources string: do not export memweight() to userspace hugetlb: update hugetlbpage.txt checkpatch: add control statement test to SINGLE_STATEMENT_DO_WHILE_MACRO mm: hugetlbfs: correctly populate shared pmd cciss: fix incorrect scsi status reporting Documentation: update mount option in filesystem/vfat.txt mm: change nr_ptes BUG_ON to WARN_ON cs5535-clockevt: typo, it's MFGPT, not MFPGT
Diffstat (limited to 'arch/parisc/include/asm/perf_event.h')
0 files changed, 0 insertions, 0 deletions