OpenCloudOS-Kernel/arch/blackfin
Linus Torvalds 27c1ee3f92 Merge branch 'akpm' (Andrew's patch-bomb)
Merge Andrew's first set of patches:
 "Non-MM patches:

   - lots of misc bits

   - tree-wide have_clk() cleanups

   - quite a lot of printk tweaks.  I draw your attention to "printk:
     convert the format for KERN_<LEVEL> to a 2 byte pattern" which
     looks a bit scary.  But afaict it's solid.

   - backlight updates

   - lib/ feature work (notably the addition and use of memweight())

   - checkpatch updates

   - rtc updates

   - nilfs updates

   - fatfs updates (partial, still waiting for acks)

   - kdump, proc, fork, IPC, sysctl, taskstats, pps, etc

   - new fault-injection feature work"

* Merge emailed patches from Andrew Morton <akpm@linux-foundation.org>: (128 commits)
  drivers/misc/lkdtm.c: fix missing allocation failure check
  lib/scatterlist: do not re-write gfp_flags in __sg_alloc_table()
  fault-injection: add tool to run command with failslab or fail_page_alloc
  fault-injection: add selftests for cpu and memory hotplug
  powerpc: pSeries reconfig notifier error injection module
  memory: memory notifier error injection module
  PM: PM notifier error injection module
  cpu: rewrite cpu-notifier-error-inject module
  fault-injection: notifier error injection
  c/r: fcntl: add F_GETOWNER_UIDS option
  resource: make sure requested range is included in the root range
  include/linux/aio.h: cpp->C conversions
  fs: cachefiles: add support for large files in filesystem caching
  pps: return PTR_ERR on error in device_create
  taskstats: check nla_reserve() return
  sysctl: suppress kmemleak messages
  ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION
  ipc: compat: use signed size_t types for msgsnd and msgrcv
  ipc: allow compat IPC version field parsing if !ARCH_WANT_OLD_COMPAT_IPC
  ipc: add COMPAT_SHMLBA support
  ...
2012-07-30 17:25:34 -07:00
..
boot Kbuild: centralize MKIMAGE and cmd_uimage definitions 2012-03-26 15:49:20 +02:00
configs bf60x: Enable Blackfin CRC crypto driver by default. 2012-07-24 13:39:48 +08:00
include ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION 2012-07-30 17:25:21 -07:00
kernel Merge branch 'for-3.6' of git://gitorious.org/linux-pwm/linux-pwm 2012-07-30 09:22:37 -07:00
lib blackfin: license: Change ADI BSD license 2012-05-21 14:54:30 +08:00
mach-bf518 blackfin: twi: Move TWI peripheral pin request array to platform data 2012-05-21 14:55:00 +08:00
mach-bf527 blackfin: fix musb macro name 2012-07-24 13:39:51 +08:00
mach-bf533 blackfin: license: Change ADI BSD license 2012-05-21 14:54:30 +08:00
mach-bf537 arch: Use eth_random_addr 2012-07-16 22:39:25 -07:00
mach-bf538 blackfin: twi: Move TWI peripheral pin request array to platform data 2012-05-21 14:55:00 +08:00
mach-bf548 bf60x: sec: Clean up interrupt initialization code for SEC. 2012-07-24 13:39:51 +08:00
mach-bf561 bf561: add capabilities in adv7183_inputs 2012-07-24 13:39:51 +08:00
mach-bf609 bf60x: fix build warning 2012-07-24 13:39:53 +08:00
mach-common bf60x: fix build warning 2012-07-24 13:39:53 +08:00
mm blackfin: bf60x: add l2 ecc irq handler 2012-05-21 14:54:23 +08:00
oprofile Blackfin arch: remove hardware PM code, oprofile not use it 2009-01-07 23:14:39 +08:00
Clear_BSD.txt blackfin: license: Change ADI BSD license 2012-05-21 14:54:30 +08:00
Kconfig Merge branch 'akpm' (Andrew's patch-bomb) 2012-07-30 17:25:34 -07:00
Kconfig.debug blackfin: bf60x: pm: Add a debug option to calculate kernel wakeup time. 2012-05-21 14:54:52 +08:00
Makefile Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2012-05-21 19:43:57 -07:00