]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 May 2012 02:22:50 +0000 (19:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 May 2012 02:22:50 +0000 (19:22 -0700)
commite8650a08232e75274304b812ff04cfce9af9671c
tree0609c942e6ca99016e788ff2ee2bbed1bb9215a4
parent3c2c4b73aa79e4a1b601710b59e092441175f4bb
parentf70d4a95edc7da87f39cd8b603ba131df2c198ed
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

Pull trivial updates from Jiri Kosina:
 "As usual, it's mostly typo fixes, redundant code elimination and some
  documentation updates."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (57 commits)
  edac, mips: don't change code that has been removed in edac/mips tree
  xtensa: Change mail addresses of Hannes Weiner and Oskar Schirmer
  lib: Change mail address of Oskar Schirmer
  net: Change mail address of Oskar Schirmer
  arm/m68k: Change mail address of Sebastian Hess
  i2c: Change mail address of Oskar Schirmer
  net: Fix tcp_build_and_update_options comment in struct tcp_sock
  atomic64_32.h: fix parameter naming mismatch
  Kconfig: replace "--- help ---" with "---help---"
  c2port: fix bogus Kconfig "default no"
  edac: Fix spelling errors.
  qla1280: Remove redundant NULL check before release_firmware() call
  remoteproc: remove redundant NULL check before release_firmware()
  qla2xxx: Remove redundant NULL check before release_firmware() call.
  aic94xx: Get rid of redundant NULL check before release_firmware() call
  tehuti: delete redundant NULL check before release_firmware()
  qlogic: get rid of a redundant test for NULL before call to release_firmware()
  bna: remove redundant NULL test before release_firmware()
  tg3: remove redundant NULL test before release_firmware() call
  typhoon: get rid of redundant conditional before all to release_firmware()
  ...
33 files changed:
Documentation/ABI/testing/sysfs-bus-usb
MAINTAINERS
Makefile
arch/arm/Kconfig
arch/blackfin/Kconfig
arch/m68k/platform/coldfire/m532x.c
arch/mips/Kconfig
arch/openrisc/Kconfig
arch/powerpc/platforms/pseries/Kconfig
drivers/hid/Kconfig
drivers/mfd/Kconfig
drivers/net/ethernet/broadcom/tg3.c
drivers/net/ethernet/brocade/bna/bnad.c
drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
drivers/net/ethernet/realtek/r8169.c
drivers/net/ethernet/s6gmac.c
drivers/net/ethernet/tehuti/tehuti.c
drivers/net/irda/Kconfig
drivers/ptp/Kconfig
drivers/regulator/tps65910-regulator.c
drivers/remoteproc/remoteproc_core.c
drivers/scsi/qla2xxx/qla_os.c
drivers/scsi/scsi_error.c
drivers/usb/gadget/u_serial.c
drivers/usb/host/Kconfig
drivers/usb/storage/unusual_devs.h
drivers/video/au1100fb.c
drivers/xen/Kconfig
fs/btrfs/disk-io.c
include/linux/tcp.h
kernel/trace/Kconfig
net/atm/lec.h
sound/pci/hda/patch_realtek.c