summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2012-05-2413-189/+218
|\
| * firewire: sbp2: document the absence of alignment requirementsClemens Ladisch2012-05-211-4/+6
| * firewire: sbp2: remove superfluous blk_queue_max_segment_size() callClemens Ladisch2012-05-211-2/+0
| * firewire: sbp2: use scsi_dma_(un)mapClemens Ladisch2012-05-211-9/+4
| * firewire: sbp2: give correct DMA device to scsi frameworkClemens Ladisch2012-05-211-1/+2
| * Merge tag 'v3.4' with SCSI updates, needed for subsequent firewire-sbp2 changesStefan Richter2012-05-211176-7920/+11719
| |\
| * | firewire: core: fw_device_refresh(): clean up error handlingClemens Ladisch2012-04-171-21/+12
| * | firewire: core: log config rom reading errorsClemens Ladisch2012-04-171-15/+27
| * | firewire: core: log error in case of failed bus manager lockClemens Ladisch2012-04-171-2/+2
| * | firewire: move rcode_string() to coreClemens Ladisch2012-04-175-29/+29
| * | firewire: core: improve reread_config_rom() interfaceClemens Ladisch2012-04-171-21/+19
| * | firewire: core: wait for inaccessible devices after bus resetClemens Ladisch2012-04-171-6/+3
| * | firewire: ohci: omit spinlock IRQ flags where possibleStefan Richter2012-04-171-13/+10
| * | firewire: ohci: correct signedness of a local variableStefan Richter2012-04-171-2/+2
| * | firewire: core: fix DMA mapping directionStefan Richter2012-04-174-39/+100
| * | firewire: use module_pci_driverAxel Lin2012-04-092-29/+6
* | | Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linuxLinus Torvalds2012-05-24323-14777/+41792
|\ \ \
| * \ \ Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/...Dave Airlie2012-05-2476-3026/+9520
| |\ \ \
| | * | | drm/nouveau/nvd9: Fix GPIO initialisation sequence.Marcin Koƛcielnicki2012-05-241-1/+1
| | * | | drm/nouveau: Unregister switcheroo client on exitAndreas Heider2012-05-241-0/+2
| | * | | drm/nouveau: Check dsm on switcheroo unregisterAndreas Heider2012-05-241-1/+2
| | * | | drm/nouveau: fix a minor annoyance in an output stringBen Skeggs2012-05-241-1/+1
| | * | | drm/nouveau: turn a BUG into a WARNBen Skeggs2012-05-241-1/+1
| | * | | drm/nv50: decode PGRAPH DATA_ERROR = 0x24Marcin Slusarz2012-05-241-0/+1
| | * | | drm/nouveau/disp: fix dithering not being enabled on some eDP macbooksBen Skeggs2012-05-241-1/+7
| | * | | drm/nvd9/copy: initialise copy engine, seems to work like nvc0Ben Skeggs2012-05-241-1/+2
| | * | | drm/nvc0/ttm: use copy engines for async buffer movesBen Skeggs2012-05-241-9/+51
| | * | | drm/nva3/ttm: use copy engine for async buffer movesBen Skeggs2012-05-241-1/+40
| | * | | drm/nv98/ttm: add in a (disabled) crypto engine buffer copy methodBen Skeggs2012-05-241-1/+20
| | * | | drm/nv84/ttm: use crypto engine for async buffer copiesBen Skeggs2012-05-241-0/+19
| | * | | drm/nouveau/ttm: untangle code to support accelerated buffer movesBen Skeggs2012-05-248-94/+119
| | * | | drm/nouveau/fbcon: use fence for sync, rather than notifierBen Skeggs2012-05-241-32/+2
| | * | | drm/nv98/crypt: non-stub implementation of the engine hooksBen Skeggs2012-05-243-14/+1434
| | * | | drm/nouveau/fifo: turn all fifo modules into engine modulesBen Skeggs2012-05-2430-1386/+1374
| | * | | drm/nv50/graph: remove ability to do interrupt-driven context switchingBen Skeggs2012-05-241-65/+0
| | * | | drm/nv50: remove manual context unload on context destructionBen Skeggs2012-05-243-94/+7
| | * | | drm/nv50: remove execution engine context saves on suspendBen Skeggs2012-05-243-14/+0
| | * | | drm/nv50/fifo: use hardware channel kickoff functionalityBen Skeggs2012-05-243-166/+43
| | * | | drm/nv50/gr: make sure NEXT_TO_CURRENT is executed even if nothing doneBen Skeggs2012-05-241-1/+1
| | * | | drm/nv50/fifo: construct playlist from hw context table stateBen Skeggs2012-05-241-14/+7
| | * | | drm/nouveau/fifo: remove all the "special" engine hooksBen Skeggs2012-05-2413-187/+62
| | * | | drm/nouveau/fence: fix a race where fence->channel can disappearBen Skeggs2012-05-246-15/+26
| | * | | drm/nouveau/bios: fix some shadowing issues, particularly acpiBen Skeggs2012-05-241-20/+10
| | * | | drm/nouveau: fix engine context destructor orderingBen Skeggs2012-05-241-2/+1
| | * | | drm/nouveau/fence: convert to exec engine, and improve channel syncBen Skeggs2012-05-2414-473/+851
| | * | | drm/nouveau/fence: minor api changes for an upcoming reworkBen Skeggs2012-05-248-158/+134
| | * | | drm/nouveau/fence: make ttm interfaces wrap ours, not the other way aroundBen Skeggs2012-05-243-71/+68
| | * | | drm/nouveau: move flip-related channel setup to software engineBen Skeggs2012-05-248-62/+84
| | * | | drm/nouveau: create real execution engine for software object classBen Skeggs2012-05-2419-282/+567
| | * | | drm/nvd0/disp: remove unnecessary sync from flip_nextBen Skeggs2012-05-241-2/+0