diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-12 21:04:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-12 21:04:04 -0800 |
| commit | 90aeb7c01c2da631cb611871a50980cbb6ca7149 (patch) | |
| tree | 0f46706d61bd5f125e351cfa3a133b88a27bdc1f /fs/ocfs2/ocfs2.h | |
| parent | 2c761270d5520dd84ab0b4e47c24d99ff8503c38 (diff) | |
| parent | 807a7515aea421f2b340140482ed4c8811c523c6 (diff) | |
Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux
* 'for-linus' of git://gitorious.org/linux-omap-dss2/linux:
OMAP: DSS2: OMAPFB: fix crash when panel driver was not loaded
OMAP: DSS2: Reject scaling settings when they cannot be supported
OMAP: DSS2: Make check-delay-loops consistent
OMAP: DSS2: OMAPFB: fix omapfb_free_fbmem()
video/omap: add __init/__exit macros to drivers/video/omap/lcd_htcherald.c
OMAP: DSS2: Fix compile warning
MAINTAINERS: Combine DSS2 and OMAPFB2 into one entry
MAINTAINERS: change omapfb maintainer
OMAP: OMAPFB: add dummy release function for omapdss
OMAP: OMAPFB: fix clk_get for RFBI
OMAP: DSS2: RFBI: convert to new kfifo API
OMAP: DSS2: Fix crash when panel doesn't define enable_te()
OMAP: DSS2: Collect interrupt statistics
OMAP: DSS2: DSI: print debug DCS cmd in hex
OMAP: DSS2: DSI: fix VC channels in send_short and send_null
Diffstat (limited to 'fs/ocfs2/ocfs2.h')
0 files changed, 0 insertions, 0 deletions