diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-21 12:19:32 +0200 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-21 12:19:32 +0200 |
| commit | e9e5f8e8d373e72f5c39dafde1ce110fc7082118 (patch) | |
| tree | 2991e33571a59cc2488daef36dcfeab7bddb9d7f /drivers/serial/m32r_sio.c | |
| parent | drm/i915: use GMBUS to manage i2c links (diff) | |
| parent | Merge remote branch 'linus' into drm-intel-fixes (diff) | |
| download | linux-e9e5f8e8d373e72f5c39dafde1ce110fc7082118.tar.xz linux-e9e5f8e8d373e72f5c39dafde1ce110fc7082118.zip | |
Merge branch 'drm-intel-fixes' into HEAD
Conflicts:
drivers/char/agp/intel-agp.c
drivers/gpu/drm/i915/intel_crt.c
Diffstat (limited to 'drivers/serial/m32r_sio.c')
0 files changed, 0 insertions, 0 deletions