diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 04:02:41 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 04:02:41 +0200 |
| commit | 9ae6d039224def926656206725ae6e89d1331417 (patch) | |
| tree | 8ebee863f61da7d095575ca7ef17812d3952389c /fs/lockd | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300 (diff) | |
| parent | viafb: add initial VX900 support (diff) | |
| download | linux-9ae6d039224def926656206725ae6e89d1331417.tar.xz linux-9ae6d039224def926656206725ae6e89d1331417.zip | |
Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6
* 'viafb-next' of git://github.com/schandinat/linux-2.6: (29 commits)
viafb: add initial VX900 support
viafb: fix hardware acceleration for suspend & resume
viafb: make suspend and resume work (on all machines?)
viafb: restore display on resume
Minimal support for viafb suspend/resume
viafb: use proper register for colour when doing fill ops
viafb: add documentation for proc interface
viafb: rename output devices
viafb: add a mapping of supported output devices
viafb: set sync polarity for all output devices
viafb: add function to change sync polarity per device
viafb: reduce I2C timeout and delay
viafb: enable I2C for CRT
viafb: fix i2c_transfer error handling
viafb: vt1636 cleanup
viafb: introduce per output device power management
viafb: limit LCD code impact
viafb: add interface for output device configuration
viafb: merge the remaining output path with enable functions
viafb: use new device routing
...
Diffstat (limited to 'fs/lockd')
0 files changed, 0 insertions, 0 deletions