Minor fixes that weren't urgent enough to go into 3.3. The two paz00

patches are in mainline already but got merged after the branch point
for this branch, so they're duplicated. I also ended up merging in
rmk/for-armsoc into this later on to fix a bug introduced by it, so it's
included but it's not the base of this branch.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAABAgAGBQJPU8YoAAoJEIwa5zzehBx30PwP/RwGkWjZya0LTPitK9OjWwPk
v3E1wT35AdVR1tWpA5f280FT+BR6EsGYggwK6oL/7Saouw8KkkxGkpXU7fxxK1IN
GPeNDKE5oAkKq0Qvldza+JZpo7Y/rOHAxpvTEI+jIjGjj9GYPAdMii0SK1TLE1ux
GshNYrltvC03gTZPHoZjhMyR2uugooOtKfauizSHV0QBtm3QTmWA9/WbjMNVmult
Q+WsUzbiyZIiFqM2KN92KrtUfs/Gm33oC/8uDr0hdPtu/g0usS5fwe4Av+LkWU7l
jcC7MOR0yJdFbqJ4iY6bHYG2amnvOn+qUjn5R0TFpPKm2koE6/dF1YBS8OdwdVvn
E1RrUF7i8Z2paMFK5LOxOO9VAJaM0TZn7D7bpV357TremhE3TWmb3KitEKZfkMEf
0l+P4AmQqQesxT71DAPOG0eV8YSCmkznmoWjFztEUvDPHaNEZc/z+egudgls9YQl
HLns8YpZov5fWC7N2w5j18IOp19chEl23zXKgfkCItV5btOJKNxxnm4vTnQunPlR
uvqySOaH4Kfb0IFg7X617nInOn2DWZyfIYwH0fYRlMiwRpq4WDPhKMcnBL6+x/um
9JoKC/crwSfNGcv0LmIL3SeZrb0sfNI0UPCy8DCMALDeED3J6mey5HH8NoygdZmk
QtKFHcE+iCSBH/iO+YNU
=IOXl
-----END PGP SIGNATURE-----