Change to carbon.
Merge pull request #1 from CyanogenMod/cm-10.1

Cm 10.1
Merge pull request #2 from CyanogenMod/cm-10.1

r2
Merge pull request #3 from CyanogenMod/cm-10.1

rootdir: Set perms on interactive governor's min_sample_time
Merge pull request #4 from CyanogenMod/cm-10.1

rootdir: set perms on ondemand governor's up_threshold
Merge pull request #5 from CyanogenMod/cm-10.1

Cm 10.1
Merge remote-tracking branch 'google/jb-mr1.1-release' into jb2
Merge github.com:CarbonDev/android_system_core into jb2
Merge pull request #7 from CyanogenMod/cm-10.1

Fix audio recording for ICS audio blobs
Merge pull request #8 from CyanogenMod/cm-10.1

Cm 10.1
Merge pull request #9 from CyanogenMod/cm-10.1

init: Check for symlinks with lstat() not open()
Merge pull request #10 from CyanogenMod/cm-10.1

Cm 10.1
liblog: fix fd leakage

File descriptors remain open across an exec unless FD_CLOEXEC is
set.  Add O_CLOEXEC to the open() call to prevent file descriptor
leakage.

In particular, the following program will eventually run out of
file descriptors:

int main(int argc, char **argv) {
  printf("===== entering main =====\n");
  ALOGW("entering main");
  system("ls -l /proc/self/fd/");

  execv(argv[0], argv);
  printf("exec failed\n");
  return -1;
}

Change-Id: I5be43ab3b9f82a05f242b1f586454c50568af388
mkbootimg: support 8192/16384 pagesizes

By now these sizes are very common, so make sure we support them.

Change-Id: Ib1963fbabc4ec0b4623f2045a3cbeedffbad7ee8
Signed-off-by: Ithamar R. Adema <ithamar@upgrade-android.com>
Close adb_usb.ini after reading it

Signed-off-by: Chris Dearman <chris@mips.com>
Change-Id: I7d3ee8cbd54af206dac89225c438e6c7322c571f
Revert "mkbootimg: support 8192/16384 pagesizes"

This reverts commit 3f7b7053049213b2f44e47ad65f955d054373b0e.
Merge pull request #11 from CyanogenMod/cm-10.1

Set permissions on io_is_busy node for interactive governor
Allow system apps to write paranoid properties

ParanoidPreferences will use this further in order to avoid root commands

patch set 2: actually working code

Change-Id: If1dcdd67699c64ba5cf428a6ff1e03b46e03a243

Conflicts:
	include/private/android_filesystem_config.h
Merge pull request #12 from CyanogenMod/cm-10.1

Cm 10.1
Merge branch 'jb2' of github.com:CarbonDev/android_system_core into jb2pa