Merge tag 'v2.6.33' for its firewire changes since last branch point

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

diff --cc drivers/firewire/core-cdev.c
index 5538d51,4eeaed5..3c1ac09
--- 1/drivers/firewire/core-cdev.c
--- 2/drivers/firewire/core-cdev.c
+++ b/drivers/firewire/core-cdev.c
@@@ -33,8 -32,10 +33,9 @@@
  #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>

diff --cc drivers/firewire/ohci.c
Simple merge