From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 26 Jul 2011 04:00:19 +0000 (-0700)
Subject: Merge 'akpm' patch series
X-Git-Tag: v3.1-rc1~241
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=45b583b10a8b438b970e95a7d1d4db22c9e35004;p=platform%2Fkernel%2Flinux-3.10.git

Merge 'akpm' patch series

* 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.
---

45b583b10a8b438b970e95a7d1d4db22c9e35004
diff --cc arch/xtensa/include/asm/uaccess.h
index 82d4e38,c141b11..3fa526fd
--- a/arch/xtensa/include/asm/uaccess.h
+++ b/arch/xtensa/include/asm/uaccess.h
@@@ -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