Dirty Merge commit with android android/kernel/omap/android-omap-3.0 branch, revision 9e83941df00bafb42218bb321ae6ef840cb4a04c.
Dirty Merge means, not all files changes where analyzed deeply and some changes are rejected in favor of existing files.