diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-07 10:30:40 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-07 10:30:40 +1000 |
| commit | d22e88ed72ed7c828c0d9020ab8f15c44e9a367b (patch) | |
| tree | f467b7a7cf2f066ed05eab686bc0b6e30774e101 /arch/s390/mm/init.c | |
| parent | 801512df1101a34fd7ad1b2c5bcb1f9d0ff24a21 (diff) | |
| parent | 5dc45967402dd124980fce88d34d7f4a012a381b (diff) | |
Merge remote branch 'galak/next'
Conflicts:
arch/powerpc/platforms/85xx/mpc85xx_mds.c
Diffstat (limited to 'arch/s390/mm/init.c')
0 files changed, 0 insertions, 0 deletions