Merge tag 'v2.6.33' for its firewire changes since last branch point
authorStefan Richter <stefanr@s5r6.in-berlin.de>
Wed, 24 Feb 2010 19:31:04 +0000 (20:31 +0100)
committerStefan Richter <stefanr@s5r6.in-berlin.de>
Wed, 24 Feb 2010 19:33:45 +0000 (20:33 +0100)
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
1  2 
drivers/firewire/core-cdev.c
drivers/firewire/ohci.c

index 5538d5130f7b8a349b22c2c28324a79828851d43,4eeaed57e2197a0dd5f0cab7cffa4713eaf2ec96..3c1ac0933d24eb83c81cb3fabab9fbe0021ff38d
  #include <linux/module.h>
  #include <linux/mutex.h>
  #include <linux/poll.h>
 -#include <linux/preempt.h>
  #include <linux/sched.h>
  #include <linux/spinlock.h>
+ #include <linux/string.h>
  #include <linux/time.h>
  #include <linux/uaccess.h>
  #include <linux/vmalloc.h>
Simple merge