| commit | f85cca6b25971a09efbe4c6a3ae405d40c8f86da | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Feb 21 14:55:49 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Feb 21 14:55:49 2011 -0800 |
| tree | 9eb12a010e8677fdf42316464185c638341c2644 | |
| parent | 6f576d57f1fa0d6026b495d8746d56d949989161 [diff] | |
| parent | dd30ac327481f1663b6526fa9fa078569188b7cc [diff] |
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] net: provide architecture specific NET_SKB_PAD [S390] atomic: use inline asm [S390] correct ipl parameter block safe guard [S390] atomic: use ACCESS_ONCE() for atomic_read() [S390] dasd: correct device table