kernel_linux

mirror of https://gitee.com/openharmony/kernel_linux synced 2025-05-24 23:56:33 +00:00

History

Dave Airlie cc84ef3fd2 Merge remote branch 'origin/master' of ../linux-2.6 into drm-next

This was a non-trivial merge with some patches sent to Linus
in drm-fixes.

Conflicts:
	drivers/gpu/drm/radeon/r300.c
	drivers/gpu/drm/radeon/radeon_asic.h
	drivers/gpu/drm/radeon/rs600.c
	drivers/gpu/drm/radeon/rs690.c
	drivers/gpu/drm/radeon/rv515.c

2009-09-08 14:49:32 +10:00

acpi

ACPI processor: force throttling state when BIOS returns incorrect value

2009-08-26 20:06:53 -07:00

asm-generic

mm: Pass virtual address to [__]p{te,ud,md}_free_tlb()

2009-07-27 12:10:38 -07:00

crypto

crypto: skcipher - Fix skcipher_dequeue_givcrypt NULL test

2009-08-29 20:44:04 +10:00

drm

drm: include seq_file.h for debugfs builds.