| commit | 533995ed85730a1f5f385b9ecb2d2b4b731d27b4 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 27 Aug 2009 03:16:38 +0000 (26 20:16 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 27 Aug 2009 03:16:38 +0000 (26 20:16 -0700) | ||
| tree | 1dcccfbece1d9275f1c595c460492afdf7551a17 | treesnapshot (tar.gz zip) |
| parent | cc674c81f01a6151ca00c617e5efa0812ee5fdbe | commitdiff |
| parent | 9848484fad9ddeb18f18f02f9ecdcd330ac9a216 | commitdiff |
Merge branch 'for-linus' of git://git./linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k,m68knommu: Wire up rt_tgsigqueueinfo and perf_counter_open
m68k: Fix redefinition of pgprot_noncached
arch/m68k/include/asm/motorola_pgalloc.h: fix kunmap arg
m68k: cnt reaches -1, not 0
m68k: count can reach 51, not 50
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k,m68knommu: Wire up rt_tgsigqueueinfo and perf_counter_open
m68k: Fix redefinition of pgprot_noncached
arch/m68k/include/asm/motorola_pgalloc.h: fix kunmap arg
m68k: cnt reaches -1, not 0
m68k: count can reach 51, not 50