Merge 'akpm' patch series
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Jul 2011 04:00:19 +0000 (21:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Jul 2011 04:00:19 +0000 (21:00 -0700)
* Merge akpm patch series: (122 commits)
  drivers/connector/cn_proc.c: remove unused local
  Documentation/SubmitChecklist: add RCU debug config options
  reiserfs: use hweight_long()
  reiserfs: use proper little-endian bitops
  pnpacpi: register disabled resources
  drivers/rtc/rtc-tegra.c: properly initialize spinlock
  drivers/rtc/rtc-twl.c: check return value of twl_rtc_write_u8() in twl_rtc_set_time()
  drivers/rtc: add support for Qualcomm PMIC8xxx RTC
  drivers/rtc/rtc-s3c.c: support clock gating
  drivers/rtc/rtc-mpc5121.c: add support for RTC on MPC5200
  init: skip calibration delay if previously done
  misc/eeprom: add eeprom access driver for digsy_mtc board
  misc/eeprom: add driver for microwire 93xx46 EEPROMs
  checkpatch.pl: update $logFunctions
  checkpatch: make utf-8 test --strict
  checkpatch.pl: add ability to ignore various messages
  checkpatch: add a "prefer __aligned" check
  checkpatch: validate signature styles and To: and Cc: lines
  checkpatch: add __rcu as a sparse modifier
  checkpatch: suggest using min_t or max_t
  ...

Did this as a merge because of (trivial) conflicts in
 - Documentation/feature-removal-schedule.txt
 - arch/xtensa/include/asm/uaccess.h
that were just easier to fix up in the merge than in the patch series.

1  2 
Documentation/feature-removal-schedule.txt
MAINTAINERS
arch/xtensa/include/asm/uaccess.h
drivers/pnp/pnpacpi/rsparser.c
drivers/rtc/rtc-s3c.c
fs/hugetlbfs/inode.c
lib/vsprintf.c
mm/backing-dev.c
mm/shmem.c

diff --cc MAINTAINERS
Simple merge
index 82d4e3815c898a589bfc2dc0378d1a8d6c82129f,c141b115d3becefb4f9780c5a18dd5cc1e4686f5..3fa526fd3c9989a3b279e4720cbb03742739cb16
@@@ -17,7 -17,7 +17,8 @@@
  #define _XTENSA_UACCESS_H
  
  #include <linux/errno.h>
+ #include <linux/prefetch.h>
 +#include <asm/types.h>
  
  #define VERIFY_READ    0
  #define VERIFY_WRITE   1
Simple merge
Simple merge
Simple merge
diff --cc lib/vsprintf.c
Simple merge
Simple merge
diff --cc mm/shmem.c
Simple merge