Merge by hand (conflicts in sr.c)
[profile/ivi/kernel-adaptation-intel-automotive.git] / ipc / util.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2