Merge commit 'v3.0' into firewire-kernel-streaming
authorClemens Ladisch <clemens@ladisch.de>
Sun, 14 Aug 2011 19:46:08 +0000 (21:46 +0200)
committerClemens Ladisch <clemens@ladisch.de>
Sun, 14 Aug 2011 19:46:08 +0000 (21:46 +0200)
commit87031d1ef6f1a7afc9ddca2805c87d2e77e1f541
tree449acf1ea907e518a45f2c1941c6bac67ebd5c13
parented4d975dde2fd0ea129d7043f0c98c90b96dcb2e
parent02f8c6aee8df3cdc935e9bdd4f2d020306035dbe
Merge commit 'v3.0' into firewire-kernel-streaming

Conflicts:
Documentation/ioctl/ioctl-number.txt
sound/firewire/Kconfig
sound/firewire/isight.c
Documentation/ioctl/ioctl-number.txt
sound/firewire/Kconfig
sound/firewire/amdtp.c