diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-09 18:52:48 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-09 18:52:48 (GMT) |
| commit | f16393776fc133d95fe3b3ba7118df579ed90af5 (patch) | |
| tree | e68d277816962511fa873e658e463948def02c3d /drivers/mfd/wm831x-otp.c | |
| parent | 2f4084209adc77f9a1c9f38db3019a509e167882 (diff) | |
| parent | 8e7fcccee990acd8135db447ad01cb3b22bce620 (diff) | |
| download | linux-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/mfd/wm831x-otp.c')
0 files changed, 0 insertions, 0 deletions