diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-21 14:07:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-21 14:07:18 -0400 |
| commit | ad21b115772dfa146f19ec5d1db9de25973c483b (patch) | |
| tree | 457b129a39a3babdc2b0bb497e90915bfddcb12b /fs/cifs/file.c | |
| parent | b91da88fed84843313a1b6fd1b1c834a24bbcf9e (diff) | |
| parent | e28f87116503f796aba4fb27d81e2c3d81966174 (diff) | |
Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6
* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6:
drm/i915: Fix unfenced alignment on pre-G33 hardware
drm/i915: Add quirk to disable SSC on Lenovo U160 LVDS
Diffstat (limited to 'fs/cifs/file.c')
0 files changed, 0 insertions, 0 deletions