Merge tag 'disintegrate-fbdev-20121220' of git://git.infradead.org/users/dhowells...