[rtems commit] Merge branch 'upstream'

[Sebastian Huber]

Module:    rtems
Branch:    master
Commit:    d189646f3e76f892d80e655d36dd69bf5d582937
Changeset: http://git.rtems.org/rtems/commit/?id=d189646f3e76f892d80e655d36dd69bf5d582937

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Thu Apr 12 10:52:29 2012 +0200

Merge branch 'upstream'

Conflicts:
	cpukit/libblock/include/rtems/bdbuf.h
	cpukit/libblock/src/bdbuf.c

---