linux/drivers/staging
Linus Torvalds aefbef10e3 Merge branch 'akpm' (patches from Andrew)
Merge first patchbomb from Andrew Morton:

 - a few misc things

 - ocfs2 udpates

 - kernel/watchdog.c feature work (took ages to get right)

 - most of MM.  A few tricky bits are held up and probably won't make 4.2.

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (91 commits)
  mm: kmemleak_alloc_percpu() should follow the gfp from per_alloc()
  mm, thp: respect MPOL_PREFERRED policy with non-local node
  tmpfs: truncate prealloc blocks past i_size
  mm/memory hotplug: print the last vmemmap region at the end of hot add memory
  mm/mmap.c: optimization of do_mmap_pgoff function
  mm: kmemleak: optimise kmemleak_lock acquiring during kmemleak_scan
  mm: kmemleak: avoid deadlock on the kmemleak object insertion error path
  mm: kmemleak: do not acquire scan_mutex in kmemleak_do_cleanup()
  mm: kmemleak: fix delete_object_*() race when called on the same memory block
  mm: kmemleak: allow safe memory scanning during kmemleak disabling
  memcg: convert mem_cgroup->under_oom from atomic_t to int
  memcg: remove unused mem_cgroup->oom_wakeups
  frontswap: allow multiple backends
  x86, mirror: x86 enabling - find mirrored memory ranges
  mm/memblock: allocate boot time data structures from mirrored memory
  mm/memblock: add extra "flags" to memblock to allow selection of memory based on attribute
  mm: do not ignore mapping_gfp_mask in page cache allocation paths
  mm/cma.c: fix typos in comments
  mm/oom_kill.c: print points as unsigned int
  mm/hugetlb: handle races in alloc_huge_page and hugetlb_reserve_pages
  ...
2015-06-24 20:47:21 -07:00
..
android mm: oom_kill: clean up victim marking and exiting interfaces 2015-06-24 17:49:43 -07:00
board
clocking-wizard
comedi Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2015-04-15 13:22:56 -07:00
dgap Staging: dgap: Use setup_timer to combine initialization 2015-03-16 16:17:31 +01:00
dgnc staging: dgnc_sysfs: Replace printk(KERN_ERR ) with pr_err() 2015-04-01 17:37:57 +02:00
emxx_udc Staging: emuxx_udc: replace pr_* with dev_* 2015-03-16 16:28:31 +01:00
fbtft staging: fbtft: Fix typo in fbtft 2015-03-26 13:07:29 +01:00
fsl-mc staging: fsl-mc: Changed version matching rules for MC object drivers 2015-04-03 13:55:03 +02:00
ft1000 staging: ft1000: Drop unneeded cast on netdev_priv 2015-04-03 14:00:14 +02:00
fwserial staging: fwserial: remove extra parentheses around function arguments 2015-03-15 18:41:11 +01:00
gdm72xx Staging: gdm72xx: use !x instead of x == NULL 2015-03-16 16:28:47 +01:00
gdm724x staging: gdm724x: Correction of variable usage after applying ALIGN() 2015-05-10 15:23:02 +02:00
goldfish staging/goldfish/goldfish_audio: Fix annotations 2015-03-20 14:13:17 +01:00
gs_fpgaboot
i2o Staging: i2o: Remove indentation of labels 2015-03-26 10:40:31 +01:00
iio Merge 4.0-rc7 into staging-next 2015-04-07 11:03:02 +02:00
lustre Changes for 4.2 2015-06-23 15:53:26 -07:00
media [media] v4l: omap4iss: Replace outdated OMAP4 control pad API with syscon 2015-04-28 08:38:23 -03:00
mt29f_spinand staging: mt29f_spinand: remove pointer to pointer cast in function argument 2015-03-15 18:41:11 +01:00
netlogic staging: netlogic: allocate right size in devm_kzalloc 2015-03-20 14:13:17 +01:00
nvec Staging driver patches for 4.1-rc1 2015-04-13 17:37:33 -07:00
octeon Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2015-04-17 15:50:54 -04:00
octeon-usb staging: octeon-usb: make CVMX_WAIT_FOR_FIELD32 to take condition expression 2015-04-03 13:57:28 +02:00
olpc_dcon staging/olpc: drop pci dependencies 2015-04-03 13:56:03 +02:00
ozwpan ozwpan: unchecked signed subtraction leads to DoS 2015-05-30 12:33:54 -07:00
panel staging: panel: fix lcd type 2015-03-26 11:00:22 +01:00
rtl8188eu Staging: rtl8188eu: replace kzalloc and memcpy by kmemdup 2015-03-26 13:16:19 +01:00
rtl8192e staging: rtl8192e: Remove dead code 2015-04-03 15:29:31 +02:00
rtl8192u Staging: rtl8192u: use correct array for debug output 2015-04-03 15:40:49 +02:00
rtl8712 staging: rtl8712: fix stack dump 2015-05-31 11:54:25 +09:00
rtl8723au cfg80211: properly send NL80211_ATTR_DISCONNECTED_BY_AP in disconnect 2015-05-26 15:21:27 +02:00
rts5208 scsi: Do not set cmd_per_lun to 1 in the host template 2015-05-31 18:06:28 -07:00
skein Staging: skein: Remove do-while(0) from single statement macros 2015-03-15 18:41:15 +01:00
slicoss Staging: slicoss: Remove redundant and disabled code block 2015-03-27 00:02:52 +01:00
sm7xxfb staging: sm7xxfb: disable pci device 2015-04-03 13:55:03 +02:00
sm750fb staging: sm750: remove incorrect __exit annotation 2015-05-08 01:58:04 +02:00
speakup staging: speakup: Fix warning of line over 80 characters. 2015-04-03 13:43:45 +02:00
ste_rmi4 Staging: ste_rmi4: Use SIMPLE_DEV_PM_OPS() macro 2015-03-20 13:37:31 +01:00
unisys Merge branch 'for-linus-1' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2015-04-14 15:31:03 -07:00
vme staging: vme: mmap() support for vme_user 2015-03-06 17:03:22 -08:00
vt6655 mac80211: convert HW flags to unsigned long bitmap 2015-06-10 16:05:36 +02:00
vt6656 mac80211: convert HW flags to unsigned long bitmap 2015-06-10 16:05:36 +02:00
wlan-ng cfg80211: properly send NL80211_ATTR_DISCONNECTED_BY_AP in disconnect 2015-05-26 15:21:27 +02:00
xgifb
Kconfig staging: fsl-mc: Freescale Management Complex (fsl-mc) bus driver 2015-03-06 17:28:09 -08:00
Makefile staging: fsl-mc: Freescale Management Complex (fsl-mc) bus driver 2015-03-06 17:28:09 -08:00
staging.c