diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-28 16:23:23 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-28 16:23:23 (GMT) |
| commit | 3c48dd49646f156158c1a96ec637b9f987f517fe (patch) | |
| tree | fd237f8d15074794e3268ce4d91bb2a16ed37ee0 /kernel/res_counter.c | |
| parent | 6e7d43f494463af3a5213a0a9fe5b9aa0f7856ab (diff) | |
| parent | 37c14e83ee173cc3f6310d80f00f2e588c402b61 (diff) | |
| download | linux-3c48dd49646f156158c1a96ec637b9f987f517fe.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k fixes from Geert Uytterhoeven:
- futex support that I had missed before,
- A long-overdue update of the m68k defconfigs.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Update defconfigs for v3.9
m68k: implement futex.h to support userspace robust futexes and PI mutexes
Diffstat (limited to 'kernel/res_counter.c')
0 files changed, 0 insertions, 0 deletions