| commit | ad4a4a82d176962ea706db555b29821af0b4dd45 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Mar 07 13:14:19 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Mar 07 13:14:19 2011 -0800 |
| tree | f7b9c8dc86fc9de64211c7cc4af911e9e2e08bf9 | |
| parent | 6277d53a9ff34ecd3837690b243aa8c8c993898d [diff] | |
| parent | 0c2bd9b24e73287aa4ee87844c847205e0da8a9b [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] tape: deadlock on system work queue [S390] keyboard: integer underflow bug [S390] xpram: remove __initdata attribute from module parameters