summaryrefslogtreecommitdiff
path: root/drivers/macintosh/via-pmu68k.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-09 22:52:48 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-09 22:52:48 +0400
commitf16393776fc133d95fe3b3ba7118df579ed90af5 (patch)
treee68d277816962511fa873e658e463948def02c3d /drivers/macintosh/via-pmu68k.c
parent2f4084209adc77f9a1c9f38db3019a509e167882 (diff)
parent8e7fcccee990acd8135db447ad01cb3b22bce620 (diff)
downloadlinux-f16393776fc133d95fe3b3ba7118df579ed90af5.tar.xz
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: [S390] Update default configuration. [S390] nss: add missing .previous statement to asm function [S390] increase default size of vmalloc area [S390] s390: disable change bit override [S390] fix io_return critical section cleanup [S390] sclp_async: potential buffer overflow [S390] arch/s390/kernel: Add missing unlock
Diffstat (limited to 'drivers/macintosh/via-pmu68k.c')
0 files changed, 0 insertions, 0 deletions