Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Linus Torvalds [Mon, 23 May 2011 16:12:26 +0000 (09:12 -0700)]
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
  b43: fix comment typo reqest -> request
  Haavard Skinnemoen has left Atmel
  cris: typo in mach-fs Makefile
  Kconfig: fix copy/paste-ism for dell-wmi-aio driver
  doc: timers-howto: fix a typo ("unsgined")
  perf: Only include annotate.h once in tools/perf/util/ui/browsers/annotate.c
  md, raid5: Fix spelling error in comment ('Ofcourse' --> 'Of course').
  treewide: fix a few typos in comments
  regulator: change debug statement be consistent with the style of the rest
  Revert "arm: mach-u300/gpio: Fix mem_region resource size miscalculations"
  audit: acquire creds selectively to reduce atomic op overhead
  rtlwifi: don't touch with treewide double semicolon removal
  treewide: cleanup continuations and remove logging message whitespace
  ath9k_hw: don't touch with treewide double semicolon removal
  include/linux/leds-regulator.h: fix syntax in example code
  tty: fix typo in descripton of tty_termios_encode_baud_rate
  xtensa: remove obsolete BKL kernel option from defconfig
  m68k: fix comment typo 'occcured'
  arch:Kconfig.locks Remove unused config option.
  treewide: remove extra semicolons
  ...

30 files changed:
1  2 
Documentation/feature-removal-schedule.txt
MAINTAINERS
arch/ia64/hp/common/sba_iommu.c
arch/mips/include/asm/cpu.h
arch/mips/mm/c-r4k.c
arch/powerpc/kernel/kgdb.c
drivers/base/memory.c
drivers/firmware/efivars.c
drivers/md/raid5.c
drivers/net/atlx/atl1.c
drivers/net/macb.c
drivers/net/s2io.c
drivers/net/ucc_geth_ethtool.c
drivers/net/usb/usbnet.c
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
drivers/net/wireless/iwlwifi/iwl-agn-calib.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/rtlwifi/core.c
drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
drivers/scsi/be2iscsi/be_main.c
drivers/scsi/constants.c
drivers/scsi/esp_scsi.c
drivers/scsi/lpfc/lpfc_bsg.c
drivers/scsi/lpfc/lpfc_sli.c
drivers/scsi/qla2xxx/qla_isr.c
fs/partitions/ldm.c
lib/Kconfig.debug
lib/vsprintf.c
mm/page_alloc.c
security/selinux/selinuxfs.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lib/vsprintf.c
Simple merge
diff --cc mm/page_alloc.c
Simple merge
Simple merge