drm: merge Linux master into HEAD

Conflicts:
	drivers/gpu/drm/drm_info.c
	drivers/gpu/drm/drm_proc.c
	drivers/gpu/drm/i915/i915_gem_debugfs.c

1 files changed, 1 insertions, 2 deletions

diff --git a/sound/oss/sequencer.c b/sound/oss/sequencer.c
index 5c215f787ca9..c79874696bec 100644
--- a/sound/oss/sequencer.c
+++ b/sound/oss/sequencer.c
@@ -212,7 +212,6 @@ int sequencer_write(int dev, struct file *file, const char __user *buf, int coun
 {
         unsigned char event_rec[EV_SZ], ev_code;
         int p = 0, c, ev_size;
-        int err;
         int mode = translate_mode(file);
 
         dev = dev >> 4;
@@ -285,7 +284,7 @@ int sequencer_write(int dev, struct file *file, const char __user *buf, int coun
                 {
                         if (!midi_opened[event_rec[2]])
                         {
-                                int mode;
+                                int err, mode;
                                 int dev = event_rec[2];
 
                                 if (dev >= max_mididev || midi_devs[dev]==NULL)