Merge tag 'v3.3.3' into 3.3/master
commit7d6001fd6a3be955aaa72c4e019b8651b7608fa6
authorJan Alexander Steffens (heftig) <jan.steffens@gmail.com>
Mon, 23 Apr 2012 02:47:32 +0000 (23 04:47 +0200)
committerJan Alexander Steffens (heftig) <jan.steffens@gmail.com>
Mon, 23 Apr 2012 02:47:32 +0000 (23 04:47 +0200)
treed0c3e4b9b6ade88e44d71538938ebab3fa0ceef0
parent81ee382bff65ceba3aaadba91600016f75347cce
parentfa023d58cc6887643fe3e5e95a7ff599e2734df3
Merge tag 'v3.3.3' into 3.3/master

This is the 3.3.3 stable release

Conflicts:
Makefile
Makefile
drivers/tty/serial/8250/8250.c
mm/memcontrol.c
security/commoncap.c