Merge branch 'for-chris' of http://git.kernel.org/pub/scm/linux/kernel/git/josef...