summaryrefslogtreecommitdiffstats
path: root/Documentation/ioctl
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2010-08-02 09:33:25 +0200
committerStefan Richter <stefanr@s5r6.in-berlin.de>2010-08-02 10:09:04 +0200
commite78483c5aeb0d7fbb0e365802145f1045e62957e (patch)
treecc1c4733486f562b26ab812ce38ff8026da70007 /Documentation/ioctl
parentLinux 2.6.35 (diff)
parenttools/firewire: nosy-dump: increment program version (diff)
parentfirewire: core: add forgotten dummy driver methods, remove unused ones (diff)
downloadlinux-e78483c5aeb0d7fbb0e365802145f1045e62957e.tar.xz
linux-e78483c5aeb0d7fbb0e365802145f1045e62957e.zip
Merge firewire branches to be released post v2.6.35
Conflicts: drivers/firewire/core-card.c drivers/firewire/core-cdev.c and forgotten #include <linux/time.h> in drivers/firewire/ohci.c Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>