original_kernel/drivers/gpu/drm/radeon
Linus Torvalds 229aebb873 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
  Update broken web addresses in arch directory.
  Update broken web addresses in the kernel.
  Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
  Revert "Fix typo: configuation => configuration" partially
  ida: document IDA_BITMAP_LONGS calculation
  ext2: fix a typo on comment in ext2/inode.c
  drivers/scsi: Remove unnecessary casts of private_data
  drivers/s390: Remove unnecessary casts of private_data
  net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
  drivers/infiniband: Remove unnecessary casts of private_data
  drivers/gpu/drm: Remove unnecessary casts of private_data
  kernel/pm_qos_params.c: Remove unnecessary casts of private_data
  fs/ecryptfs: Remove unnecessary casts of private_data
  fs/seq_file.c: Remove unnecessary casts of private_data
  arm: uengine.c: remove C99 comments
  arm: scoop.c: remove C99 comments
  Fix typo configue => configure in comments
  Fix typo: configuation => configuration
  Fix typo interrest[ing|ed] => interest[ing|ed]
  Fix various typos of valid in comments
  ...

Fix up trivial conflicts in:
	drivers/char/ipmi/ipmi_si_intf.c
	drivers/usb/gadget/rndis.c
	net/irda/irnet/irnet_ppp.c
2010-10-24 13:41:39 -07:00
..
reg_srcs
.gitignore
Kconfig
Makefile
ObjectID.h
atom-bits.h
atom-names.h
atom-types.h
atom.c
atom.h
atombios.h
atombios_crtc.c
atombios_dp.c
avivod.h
evergreen.c
evergreen_cs.c
evergreen_reg.h
evergreend.h
mkregtable.c
r100.c
r100_track.h
r100d.h
r200.c
r300.c
r300_cmdbuf.c
r300_reg.h
r300d.h
r420.c
r420d.h
r500_reg.h
r520.c
r520d.h
r600.c
r600_audio.c
r600_blit.c
r600_blit_kms.c
r600_blit_shaders.c
r600_blit_shaders.h
r600_cp.c
r600_cs.c
r600_hdmi.c
r600_reg.h
r600d.h
radeon.h
radeon_acpi.c
radeon_agp.c
radeon_asic.c
radeon_asic.h
radeon_atombios.c
radeon_atpx_handler.c
radeon_benchmark.c
radeon_bios.c
radeon_clocks.c
radeon_combios.c
radeon_connectors.c
radeon_cp.c
radeon_cs.c
radeon_cursor.c
radeon_device.c
radeon_display.c
radeon_drv.c
radeon_drv.h
radeon_encoders.c
radeon_family.h
radeon_fb.c
radeon_fence.c
radeon_gart.c
radeon_gem.c
radeon_i2c.c
radeon_ioc32.c
radeon_irq.c
radeon_irq_kms.c
radeon_kms.c
radeon_legacy_crtc.c
radeon_legacy_encoders.c
radeon_legacy_tv.c
radeon_mem.c
radeon_mode.h
radeon_object.c
radeon_object.h
radeon_pm.c
radeon_reg.h
radeon_ring.c
radeon_state.c
radeon_test.c
radeon_ttm.c
rs100d.h
rs400.c
rs400d.h
rs600.c
rs600d.h
rs690.c
rs690d.h
rv200d.h
rv250d.h
rv350d.h
rv515.c
rv515d.h
rv770.c
rv770d.h