| commit | ae693400bd2dd438f2bbacbb925233ba1dee9236 | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Fri Mar 07 09:04:32 2014 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Fri Mar 07 09:04:32 2014 +1000 |
| tree | 115f56a6a5214b18b68ecad489393452ea70fd85 | |
| parent | 7a4ee320cd33468e251f84631ff3b79fa6b6eb14 [diff] | |
| parent | d13c46c67e546bb1dc1c4dc7c43e388d0119276b [diff] |
Merge branch 'drm-armada-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox into drm-fixes fix for kfifo api change. * 'drm-armada-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox: DRM: armada: fix use of kfifo_put()