Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git # Conflicts: # drivers/tty/serial/sc16is7xx.c