summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'disintegrate-asm-generic' of git://git.infradead.org/users/dhow...Arnd Bergmann2012-10-046983-208692/+377937
|\
| * UAPI: (Scripted) Disintegrate include/asm-genericDavid Howells2012-10-0450-1727/+1778
| * UAPI: Fix conditional header installation handling (notably kvm_para.h on m68k)David Howells2012-10-041-6/+3
| * Merge remote-tracking branch 'c6x/for-linux-next' into uapi-prepDavid Howells2012-10-043-17/+3
| |\
| | * c6x: remove c6x signal.hMark Salter2012-10-042-17/+1
| | * c6x: make dsk6455 the default configMark Salter2012-10-031-0/+2
| * | UAPI: Split compound conditionals containing __KERNEL__ in Arm64David Howells2012-10-043-3/+9
| * | UAPI: Fix the guards on various asm/unistd.h filesDavid Howells2012-10-049-40/+0
| * | Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linuxLinus Torvalds2012-10-04562-43313/+71064
| |\ \
| | * \ Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/...Dave Airlie2012-10-03469-38085/+54203
| | |\ \
| | | * | drm/nv98/crypt: fix fuc build with latest envyasBen Skeggs2012-10-031-1/+1
| | | * | drm/nouveau/devinit: fixup various issues with subdev ctor/init orderingBen Skeggs2012-10-032-16/+38
| | | * | drm/nv41/vm: fix and enable use of "real" pciegartBen Skeggs2012-10-032-7/+14
| | | * | drm/nv44/vm: fix and enable use of "real" pciegartBen Skeggs2012-10-034-41/+29
| | | * | drm/nv04/dmaobj: fixup vm target handling in preparation for nv4x pcieBen Skeggs2012-10-031-7/+10
| | | * | drm/nouveau: store supported dma mask in vmmgrBen Skeggs2012-10-037-7/+9
| | | * | drm/nvc0/ibus: initial implementation of subdevBen Skeggs2012-10-034-0/+134
| | | * | drm/nouveau/therm: add support for fan-control modesMartin Peres2012-10-036-5/+105
| | | * | drm/nouveau/hwmon: rename pwm0* to pmw1* to follow hwmon's rulesMartin Peres2012-10-031-18/+18
| | | * | drm/nouveau/therm: calculate the pwm divisor on nv50+Martin Peres2012-10-033-4/+37
| | | * | drm/nouveau/fan: rewrite the fan tachometer driver to get more precision, fasterMartin Peres2012-10-031-9/+16
| | | * | drm/nouveau/therm: move thermal-related functions to the therm subdevMartin Peres2012-10-0322-542/+1048
| | | * | drm/nouveau/bios: parse the pwm divisor from the perf tableMartin Peres2012-10-033-0/+90
| | | * | drm/nouveau/therm: use the EXTDEV table to detect i2c monitoring devicesMartin Peres2012-10-034-0/+174
| | | * | drm/nouveau/therm: rework thermal table parsingMartin Peres2012-10-036-205/+282
| | | * | drm/nouveau/gpio: expose the PWM/TOGGLE parameter found in the gpio vbios tableMartin Peres2012-10-032-0/+10
| | | * | drm/nouveau: fix pm initialization orderDmitry Eremin-Solenikov2012-10-031-1/+2
| | | * | drm/nouveau/bios: check that fixed tvdac gpio data is valid before using itBen Skeggs2012-10-031-7/+11
| | | * | drm/nouveau: log channel debug/error messages from client object rather than ...Ben Skeggs2012-10-031-5/+5
| | | * | drm/nouveau: have drm debugging macros build on top of core macrosBen Skeggs2012-10-031-13/+6
| | | * | drm/nouveau/core: have client-id be a string, rather than an integerBen Skeggs2012-10-034-10/+14
| | | * | drm/nvc0/fifo: re-bash PBUS regs after vm-fault to BARs/PEEPHOLEBen Skeggs2012-10-031-4/+18
| | | * | drm/nvc0/gr: implement initial trap handlerBen Skeggs2012-10-031-4/+188
| | | * | drm/nvc0/gr: rebuild fuc with latest envyasBen Skeggs2012-10-034-12/+167
| | | * | drm/nvc0/ltcg: read LTS count at startupBen Skeggs2012-10-031-1/+3
| | | * | drm/nve0/gr: enable use of our fuc by defaultBen Skeggs2012-10-031-1/+1
| | | * | drm/nve0/gr: remove 0x404160 bashing from hub fucBen Skeggs2012-10-032-282/+189
| | | * | drm/nve0/gr: initial fuc implementation, based on fermi's codeBen Skeggs2012-10-036-69/+3235
| | | * | drm/nve0/ibus: handle PIBUS interrupts to prevent stormBen Skeggs2012-10-036-0/+162
| | | * | drm/nouveau/sw: trap and clear PMC_INTR_0_SOFTWAREBen Skeggs2012-10-035-0/+12
| | | * | drm/nouveau: quiet some static-related sparse noiseMarcin Slusarz2012-10-0325-47/+51
| | | * | drm/nouveau: constify instances of nouveau_bitfield and nouveau_enum structsMarcin Slusarz2012-10-0312-39/+39
| | | * | drm/nouveau/fifo: use defines instead of hardcoded class idsBen Skeggs2012-10-039-12/+20
| | | * | drm/nouveau/dmaobj: reject unsupported parent types instead of half-succeedingBen Skeggs2012-10-032-10/+16
| | | * | drm/nouveau: add defines for internal class namesBen Skeggs2012-10-031-14/+35
| | | * | drm/nv50/fifo: add support for dma channel classBen Skeggs2012-10-033-7/+72
| | | * | drm/nv84/fifo: add support for dma channel classBen Skeggs2012-10-033-7/+81
| | | * | drm/nouveau/fifo: version the dma channel class structBen Skeggs2012-10-036-6/+6
| | | * | drm/nouveau/fifo: separate object classes for dma channelsBen Skeggs2012-10-036-5/+10
| | | * | drm/nouveau: restore fifo chid information in engine error messagesBen Skeggs2012-10-0315-132/+213