summaryrefslogtreecommitdiffstats
path: root/drivers/video/cfbfillrect.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-28 03:36:38 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-28 03:36:38 +0200
commit6658a6991cef75719a21441aa0b7f8d6821534ee (patch)
tree656bd5785f225929c73b43b31d6eda35fab93026 /drivers/video/cfbfillrect.c
parentMerge branch 'for-linus-3.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel... (diff)
parent[S390] register cpu devices for SMP=n (diff)
downloadlinux-6658a6991cef75719a21441aa0b7f8d6821534ee.tar.xz
linux-6658a6991cef75719a21441aa0b7f8d6821534ee.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 patches part 2 from Martin Schwidefsky: "Some minor improvements and one additional feature for the 3.4 merge window: Hendrik added perf support for the s390 CPU counters." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: [S390] register cpu devices for SMP=n [S390] perf: add support for s390x CPU counters [S390] oprofile: Allow multiple users of the measurement alert interrupt [S390] qdio: log all adapter characteristics [S390] Remove unncessary export of arch_pick_mmap_layout
Diffstat (limited to 'drivers/video/cfbfillrect.c')
0 files changed, 0 insertions, 0 deletions