diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-23 20:35:02 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-23 20:35:02 -0800 |
| commit | 4ad3041d3b76632c02b50aa384a8f21d7d15bac0 (patch) | |
| tree | 5b43d0934d8328a15498c6898c56ec71e020ccd1 /fs/xfs/xfs_discard.c | |
| parent | f6be19c8bcca7185dcbda61f34f99d8b15bcd165 (diff) | |
| parent | e6b267ce14f61d9da0151b97ee26ab4d38055567 (diff) | |
Merge tag 'imx-fixes-3.8-3' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes
From Shawn Guo:
This is yet another critical imxfb fixes held off by absence of FB
maintainer for some time.
* tag 'imx-fixes-3.8-3' of git://git.linaro.org/people/shawnguo/linux-2.6:
video: imxfb: Do not crash on reboot
Diffstat (limited to 'fs/xfs/xfs_discard.c')
0 files changed, 0 insertions, 0 deletions