summaryrefslogtreecommitdiff
path: root/net/caif/cfdgml.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-06-27 07:36:16 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-06-27 07:36:16 -0700
commit7f607455c3b91fec267c48a4177526cbb5e501f4 (patch)
tree8557e1e217c9d20f2f43cd40e1c47d6ee549db9b /net/caif/cfdgml.c
parentbe1d29f59ca3ec7dfbbae24d4f68d357f5a31c4b (diff)
parentbc092a303a1b980c67324920471e23354b0721cd (diff)
Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux
* 'for-linus' of git://gitorious.org/linux-omap-dss2/linux: OMAP: OMAPFB: fix rfbi.c compile error OMAPFB: LCDC: change update_mode to DISABLED when going suspend
Diffstat (limited to 'net/caif/cfdgml.c')
0 files changed, 0 insertions, 0 deletions