kernel-fxtec-pro1x/drivers/staging/msm
Linus Torvalds 008d23e485 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: (43 commits)
  Documentation/trace/events.txt: Remove obsolete sched_signal_send.
  writeback: fix global_dirty_limits comment runtime -> real-time
  ppc: fix comment typo singal -> signal
  drivers: fix comment typo diable -> disable.
  m68k: fix comment typo diable -> disable.
  wireless: comment typo fix diable -> disable.
  media: comment typo fix diable -> disable.
  remove doc for obsolete dynamic-printk kernel-parameter
  remove extraneous 'is' from Documentation/iostats.txt
  Fix spelling milisec -> ms in snd_ps3 module parameter description
  Fix spelling mistakes in comments
  Revert conflicting V4L changes
  i7core_edac: fix typos in comments
  mm/rmap.c: fix comment
  sound, ca0106: Fix assignment to 'channel'.
  hrtimer: fix a typo in comment
  init/Kconfig: fix typo
  anon_inodes: fix wrong function name in comment
  fix comment typos concerning "consistent"
  poll: fix a typo in comment
  ...

Fix up trivial conflicts in:
 - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)
 - fs/ext4/ext4.h

Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.
2011-01-13 10:05:56 -08:00
..
ebi2_l2f.c
ebi2_lcd.c
ebi2_tmd20.c
hdmi_sii9022.c
Kconfig
lcdc.c
lcdc_external.c
lcdc_gordon.c
lcdc_panel.c
lcdc_prism.c
lcdc_sharp_wvga_pt.c
lcdc_st15.c
lcdc_toshiba_wvga_pt.c
logo.c
Makefile
mddi.c
mddi_ext.c
mddi_ext_lcd.c
mddi_prism.c
mddi_sharp.c
mddi_toshiba.c
mddi_toshiba.h
mddi_toshiba_vga.c
mddi_toshiba_wvga_pt.c
mddihost.c
mddihost.h
mddihost_e.c
mddihosti.c
mddihosti.h
mdp.c
mdp.h
mdp4.h
mdp4_debugfs.c
mdp4_overlay.c
mdp4_overlay_lcdc.c
mdp4_overlay_mddi.c
mdp4_util.c
mdp_cursor.c
mdp_dma.c
mdp_dma_lcdc.c
mdp_dma_s.c
mdp_dma_tv.c
mdp_hw_init.c
mdp_ppp.c
mdp_ppp_dq.c
mdp_ppp_dq.h
mdp_ppp_v20.c
mdp_ppp_v31.c
mdp_vsync.c
memory.c
memory_ll.h
msm_fb.c
msm_fb.h
msm_fb_bl.c
msm_fb_def.h
msm_fb_panel.c
msm_fb_panel.h
msm_mdp.h
staging-devices.c
TODO
tv_ntsc.c
tv_pal.c
tvenc.c
tvenc.h