aboutsummaryrefslogtreecommitdiff
path: root/arch/ia64/kernel/setup.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2007-01-11 18:25:20 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2007-01-11 18:25:20 -0800
commit5b94d541806da24c8dbbff629486d65ce71dec46 (patch)
tree9c029641a52ffc57d0244174bfd18edfd1759315 /arch/ia64/kernel/setup.c
parente176d397ad73ca76936e5638c2c81740dedb9d5d (diff)
parenteac681b3aec226c83f52d307254d88393aab5eb9 (diff)
Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: i915: Fix a DRM_ERROR that should be DRM_DEBUG.
Diffstat (limited to 'arch/ia64/kernel/setup.c')
0 files changed, 0 insertions, 0 deletions