diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-17 09:44:09 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-17 09:44:09 -0700 |
commit | 3aee0605a41399063c0ad396f1f4267108f210d3 (patch) | |
tree | c9e3ce738c3d093dbd861c5a53b63157edd893c2 /arch/m68k/include/asm/checksum_mm.h | |
parent | f4c3f03838ae47a92f2d15d48ddf68deae5d7ebb (diff) | |
parent | 0396c215f301e92677d1e9a064b405e31501dc1d (diff) |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb
* 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb:
uwb: avoid radio controller reset loops
uwb: stop uwbd thread if rc->start() fails
uwb: handle radio controller events with out-of-range IDs correctly
Diffstat (limited to 'arch/m68k/include/asm/checksum_mm.h')
0 files changed, 0 insertions, 0 deletions