| commit | 7f607455c3b91fec267c48a4177526cbb5e501f4 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jun 27 07:36:16 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jun 27 07:36:16 2010 -0700 |
| tree | 8557e1e217c9d20f2f43cd40e1c47d6ee549db9b | |
| parent | be1d29f59ca3ec7dfbbae24d4f68d357f5a31c4b [diff] | |
| parent | bc092a303a1b980c67324920471e23354b0721cd [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