summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2017-02-12 22:24:44 +0000
committerRussell King <rmk+kernel@armlinux.org.uk>2017-02-12 22:24:44 +0000
commit0d6cc838f520967e4dc0ee25c4916cef917f587e (patch)
tree3598a21d0b8c3d30a95443bfe37e5ccba64cddb9 /lib
parent228dbbfb5d77f8e047b2a1d78da14b7158433027 (diff)
parentbf4b17749f8632696134c8705f294ce02c85c1fa (diff)
parentd929fcb3186695e5cebf30c655b198ce84cc0a22 (diff)
parentd5adbfcd5f7bcc6fa58a41c5c5ada0e5c826ce2c (diff)
Merge branches 'fixes', 'kuser', 'misc' and 'sa1100-base' into for-next