[rtems commit] Merge branch 'upstream'

[Sebastian Huber]

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

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Wed May 16 11:56:25 2012 +0200

Merge branch 'upstream'

Conflicts:
	cpukit/libcsupport/include/sys/ioccom.h

---