summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [TIPC] Cleaned up info/warn/err macrosPer Liden2006-01-124-7/+7
* [TIPC] License header updatePer Liden2006-01-1250-876/+1076
* [TIPC] Moved configuration interface into tipc_config.hPer Liden2006-01-125-412/+456
* [TIPC} Fixed bug in disc_timeout()Jon Maloy2006-01-122-27/+5
* [TIPC] Use dynamically allocated family id with NETLINK_GENERICPer Liden2006-01-122-3/+2
* [TIPC] Initial mergePer Liden2006-01-1254-0/+19464
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6Linus Torvalds2006-01-123-2/+62
|\
| * [PATCH] pcmcia: runtime powermanagement interfaceDominik Brodowski2006-01-122-2/+60
| * [PATCH] pcmcia: add new IDs for serial_cs.cDominik Brodowski2006-01-121-0/+2
* | Merge branch 'drm-forlinus' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2006-01-1273-1812/+2794
|\ \
| * | drm: fix issues with systems with no MTRRDave Airlie2006-01-121-0/+14
| * | drm: cleanup properly on drm module unloadDave Airlie2006-01-111-6/+6
| * | drm: fixup drm bufs being just under the EOMDave Airlie2006-01-111-1/+1
| * | drm: fix radeon warnings on 64-bitDave Airlie2006-01-101-3/+3
| * | drm: fix warning on alphaDave Airlie2006-01-101-0/+2
| * | drm: remove is_pci flag completely...Dave Airlie2006-01-031-1/+0
| * | drm: merge in Linus mainlineDave Airlie2006-01-032195-62718/+59347
| |\ \
| * | | drm: major update from CVS for radeon and coreDave Airlie2006-01-0212-381/+366
| * | | drm: update drm pci ids listDave Airlie2006-01-021-1/+11
| * | | drm: drm_ioctl.c sync with fixes from CVSDave Airlie2006-01-021-5/+10
| * | | drm: update lock flags from userspaceDave Airlie2006-01-021-2/+2
| * | | drm: update to i915 1.3.0Dave Airlie2006-01-026-39/+78
| * | | drm: update drm_memory_debug.hDave Airlie2006-01-021-135/+134
| * | | drm: proper fix for drm_contextDave Airlie2006-01-021-2/+1
| * | | drm: fix issue with contexts running out of RAMDave Airlie2006-01-021-0/+4
| * | | drm: update PCIGART support from CVSDave Airlie2006-01-028-38/+43
| * | | drm: remove old reclaim_buffers from ix0 driversDave Airlie2006-01-022-2/+0
| * | | drm: bring savage inline with latest CVSDave Airlie2006-01-022-17/+27
| * | | drm: fix a LOR issue on FreeBSD for savage driverDave Airlie2006-01-022-176/+171
| * | | drm: bring sis + tdfx up to latest CVSDave Airlie2006-01-025-15/+42
| * | | drm: via driver update to CVS versionDave Airlie2006-01-026-6/+951
| * | | drm: move ioctl flags to a bit field of flagsDave Airlie2006-01-0211-177/+182
| * | | drm: update VIA driver to 2.7.2Dave Airlie2005-11-1212-98/+211
| * | | drm: drop mtrr from i915Dave Airlie2005-11-111-1/+4
| * | | drm: update mga driver for new bootstrap codeDave Airlie2005-11-113-62/+92
| * | | drm: remove exports that modules shouldn't use.Dave Airlie2005-11-111-8/+0
| * | | drm: add in-kernel entry points for rest of AGP ioctlsDave Airlie2005-11-114-52/+95
| * | | drm: simplify sysfs code for drmDave Airlie2005-11-116-52/+52
| * | | drm: fixup drm_proc.c struct tableDave Airlie2005-11-111-9/+7
| * | | drm: remove old backwards compatibilty stuffDave Airlie2005-11-111-14/+0
| * | | drm: remove drm_flushDave Airlie2005-11-114-17/+0
| * | | drm: cleanup via_ds.c includesDave Airlie2005-11-111-8/+1
| * | | drm: remove remnamt of old DRM code from tdfxDave Airlie2005-11-111-4/+0
| * | | drm: remove drm_init.c it is no longer neededDave Airlie2005-11-104-55/+18
| * | | drm: rename driver hooks more understandablyDave Airlie2005-11-1030-484/+330
* | | | Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2006-01-1237-135/+6114
|\ \ \ \
| * | | | [ARM] Convert some arm semaphores to mutexesArjan van de Ven2006-01-129-58/+67
| * | | | [ARM] Allow r2 to be passed through the decompressor to the kernelRussell King2006-01-121-21/+25
| * | | | [ARM] 3256/1: Make the function-returning ldm's use sp as the base registerCatalin Marinas2006-01-124-11/+13
| * | | | [ARM] 3237/1: PXA I2C driver updatesRichard Purdie2006-01-121-0/+10