Merge branch 'android-omap-tuna-3.0-jb-mr2' into lk-jb-mr2

Conflicts:
	Documentation/cpu-freq/governors.txt
	Makefile
	arch/arm/configs/tuna_defconfig
	arch/arm/include/asm/mutex.h
	arch/arm/kernel/smp.c
	arch/x86/kernel/cpu/amd.c
	arch/x86/mm/init.c
	drivers/acpi/video.c
	drivers/char/random.c
	drivers/cpufreq/cpufreq_interactive.c
	drivers/gpu/drm/i915/intel_lvds.c
	drivers/net/r8169.c
	drivers/usb/serial/ftdi_sio.c
	drivers/usb/serial/ftdi_sio_ids.h
	drivers/usb/serial/option.c
	drivers/video/console/fbcon.c
	fs/sysfs/dir.c
	kernel/cgroup.c
	kernel/sys.c
	kernel/time/tick-broadcast.c
	mm/migrate.c
	mm/mmu_notifier.c
	net/core/rtnetlink.c
	net/ipv4/ping.c
	net/ipv4/tcp_input.c
	sound/usb/card.c
	sound/usb/midi.c
Linux 3.0.88
net: wireless: bcmdhd: Enable p2p support bits for p2p device

Change-Id: Ie3537aaeecdbbddb5219b41c42f2f6ac5d85f5b4
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ipv6: introdcue __ipv6_addr_needs_scope_id and ipv6_iface_scope_id helper functions

[net-next commit b7ef213ef65256168df83ddfbb8131ed9adc10f9]

__ipv6_addr_needs_scope_id checks if an ipv6 address needs to supply
a 'sin6_scope_id != 0'. 'sin6_scope_id != 0' was enforced in case
of link-local addresses. To support interface-local multicast these
checks had to be enhanced and are now consolidated into these new helper
functions.

v2:
a) migrated to struct ipv6_addr_props

v3:
a) reverted changes for ipv6_addr_props
b) test for address type instead of comparing scope

v4:
a) unchanged

Change-Id: Id6fc54cec61f967928e08a9eba4f857157d973a3
Suggested-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Cc: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net: ipv6: Add IPv6 support to the ping socket.

[backport of net-next 6d0bfe22611602f36617bc7aa2ffa1bbb2f54c67]

This adds the ability to send ICMPv6 echo requests without a
raw socket. The equivalent ability for ICMPv4 was added in
2011.

Instead of having separate code paths for IPv4 and IPv6, make
most of the code in net/ipv4/ping.c dual-stack and only add a
few IPv6-specific bits (like the protocol definition) to a new
net/ipv6/ping.c. Hopefully this will reduce divergence and/or
duplication of bugs in the future.

Caveats:

- Setting options via ancillary data (e.g., using IPV6_PKTINFO
  to specify the outgoing interface) is not yet supported.
- There are no separate security settings for IPv4 and IPv6;
  everything is controlled by /proc/net/ipv4/ping_group_range.
- The proc interface does not yet display IPv6 ping sockets
  properly.

Tested with a patched copy of ping6 and using raw socket calls.
Compiles and works with all of CONFIG_IPV6={n,m,y}.

Change-Id: Ia359af556021344fc7f890c21383aadf950b6498
Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[lorenzo@google.com: backported to 3.0]
Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
ping: always initialize ->sin6_scope_id and ->sin6_flowinfo

[net-next commit c26d6b46da3ee86fa8a864347331e5513ca84c2b]

If we don't need scope id, we should initialize it to zero.
Same for ->sin6_flowinfo.

Change-Id: I28e4bc9593e76fc3434052182466fab4bb8ccf3a
Cc: Lorenzo Colitti <lorenzo@google.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
Acked-by: Lorenzo Colitti <lorenzo@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Linux 3.0.89
Revert "Revert "fs/dcache.c: adaptive vfs_cache_pressure on suspend / resume""

This reverts commit 8fb26342cac949b29b91f2e6b77c382fa8dc4038.
Revert "Revert "fs/dache.c / mm/page-writeback.c: allow modification of dirty_-values and cache_pressure despite the dynamic suspend/resume values""

This reverts commit 5a137fcdc2b545a2bc9a020d309b1c33f04d6eb4.
Defconfig: use 3Gvmsplit as default