aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/matroxfb.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-12 21:47:41 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-12 21:47:41 -0400
commite225ca27057e70e7cbb14ae4c1e5f758973af645 (patch)
tree80a2de6cddda12d11b5379dca312e3fae507e225 /include/linux/matroxfb.h
parent54f7fc25e5736c39050454fe6b5a2bed027fbfab (diff)
parent55c2770e413e96871147b9406a9c41fe9bc5209c (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull Sparc updates from David Miller: 1) Updated syscall tracing fix from Al Viro. 2) SUN4V error reporting was deficient in several areas. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: sparc64: fix ptrace interaction with force_successful_syscall_return() sparc64: Fix deficiencies in sun4v error reporting.
Diffstat (limited to 'include/linux/matroxfb.h')
0 files changed, 0 insertions, 0 deletions