diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-26 01:47:58 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-26 01:47:58 +0100 |
| commit | ffbf0ab1a648b867ce953cc43557090f679bb9c1 (patch) | |
| tree | df90a9fe3b46b636d977e9aa993efe5588436d1c /kernel/posix-cpu-timers.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| parent | m68k: merge m68k and m68knommu arch directories (diff) | |
| download | linux-ffbf0ab1a648b867ce953cc43557090f679bb9c1.tar.xz linux-ffbf0ab1a648b867ce953cc43557090f679bb9c1.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k: merge m68k and m68knommu arch directories
Diffstat (limited to 'kernel/posix-cpu-timers.c')
0 files changed, 0 insertions, 0 deletions