Don't set local versioning
add the following governors:

* Lagfree, Lazy, Lulzactive and Minmax
General cleanup of the governors:
    * Don't define Ticks or sampling rate in the governors, they are already defined in Kconfig

Conflicts:
	arch/arm/configs/bricked_defconfig
	drivers/cpufreq/cpufreq_ondemand.c
General cleanup of the governors:
    * Don't define Ticks or sampling rate in the governors, they are already defined in Kconfig

Conflicts:
	arch/arm/configs/bricked_defconfig
	drivers/cpufreq/cpufreq_ondemand.c
Enable the option "Ramp up CPU frequency on input events" for the following governors:
    * Lagfree, Ondemand, Minmax, Lulzactive and Lazy

Conflicts:
	arch/arm/configs/bricked_defconfig

Conflicts:
	arch/arm/configs/bricked_defconfig
Add the sio and vr i/o schedulers

Conflicts:
	block/Kconfig.iosched
	block/Makefile
Update defconfig
Minmax: Include shed.h and tick.h

Signed-off-by: Paul Beeler <sparksco@gmail.com>
[cpufreq] add smartassV2 governor
drivers/cpufreq: update smartass2 config
Set as-instr to use printf intsead of echo

as-instr was hardcoded to use /bin/echo with the -e option.
Non-GNU systems like MacOSX would fail and cause compiler errors.

Since BSD echo does not have the -e option (escape backslashes)
prinf was used instead would should be more friendly cross-platform

Specifically with the new OSX toolchain it caused the following
error:
  Error: selected processor does not support ARM mode `smc #0'

This was caused by $(call as-instr,.arch_extension sec,+sec) failing
since it was using echo -e.

See: http://pubs.opengroup.org/onlinepubs/9699919799/utilities/echo.html

  "It is not possible to use echo portably across all POSIX systems
   unless both -n (as the first argument) and escape sequences are
   omitted.

  The printf utility can be used portably to emulate any of the
  traditional behaviors of the echo utility as follows (assuming
  that IFS has its standard value or is unset)

  New applications are encouraged to use printf instead of echo."

Change-Id: I558ec343e9bb8d449e1af710d329b4dc76743a05
mm: Set settings into kernel rather than script

Conflicts:

	include/linux/mm.h
	mm/vmscan.c
smartass2: change DEFAULT_SLEEP_WAKEUP_FREQ from 99999999 (wtf?) to 972000
Block: Add the BFQ-v5 I/O scheduler to 3.1

The general structure is borrowed from CFQ, as much code. A
(bfq_)queue is associated to each task doing I/O on a device,
and each time a scheduling decision has to be taken a queue is
selected and it is served until it expires.

    - Slices are given in the service domain: tasks are
      assigned budgets, measured in number of sectors. Once got
      the disk, a task must however consume its assigned budget
      within a configurable maximum time (by default, the
      maximum possible value of the budgets is automatically
      computed to comply with this timeout). This allows the
      desired latency vs "throughput boosting" tradeoff to be
      set.

    - Budgets are scheduled according to a variant of WF2Q+,
      implemented using an augmented rb-tree to take
      eligibility into account while preserving an O(log N)
      overall complexity.

    - A low-latency tunable is provided; if enabled, both
      interactive and soft real-time applications are
      guaranteed very low latency.

    - Latency guarantees are preserved also in presence of NCQ.

    - High throughput with flash-based devices, while still
      preserving latency guarantees.

    - Useful features borrowed from CFQ: cooperating-queues
      merging (with some additional optimizations with respect
      to the original CFQ version), static fallback queue for
      OOM.

    - BFQ supports full hierarchical scheduling, exporting a
      cgroups interface.  Each node has a full scheduler, so
      each group can be assigned its own ioprio and an
      ioprio_class.

    - If the cgroups interface is used, weights can be
      explictly assigned, otherwise ioprio values are mapped
      to weights using the relation
      weight = IOPRIO_BE_NR - ioprio.

    - ioprio classes are served in strict priority order,
      i.e., lower priority queues are not served as long as
      there are higher priority queues.  Among queues in the
      same class the bandwidth is distributed in proportion to
      the weights of each queue. A very thin extra bandwidth
      is however guaranteed to the Idle class, to prevent it
      from starving.

Signed-off-by: Paul Beeler <sparksco@gmail.com>

Conflicts:
	block/Kconfig.iosched

Conflicts:
	block/Kconfig.iosched
Compilation:

Config mismatch debug to fix all mismatch warnings

Signed-off-by: Paul Beeler <sparksco@gmail.com>
Version bump Divemaster Edition