tree c9e3ce738c3d093dbd861c5a53b63157edd893c2
parent f4c3f03838ae47a92f2d15d48ddf68deae5d7ebb
parent 0396c215f301e92677d1e9a064b405e31501dc1d
author Linus Torvalds <torvalds@linux-foundation.org> 1253205849 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1253205849 -0700

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