My adjustments

On branch cm-11.0
Changes not staged for commit:
	modified:   p880.mk
no changes added to commit (use "git add" and/or "git commit -a")
On branch cm-11.0
Changes not staged for commit:
	modified:   init.x3.rc
Untracked files:
	Patches/
no changes added to commit (use "git add" and/or "git commit -a")
On branch cm-11.0
Untracked files:
	patches/
nothing added to commit but untracked files present (use "git add" to track)
On branch cm-11.0
Changes not staged for commit:
	modified:   init.x3.rc
Untracked files:
	patches/0001-Telephony-add-NT_MODE_GSM_UMTS-to-network-choice.patch
no changes added to commit (use "git add" and/or "git commit -a")
On branch cm-11.0
Changes not staged for commit:
	modified:   init.x3.rc
Untracked files:
	patches/packages/
no changes added to commit (use "git add" and/or "git commit -a")
On branch cm-11.0
Changes not staged for commit:
	modified:   BoardConfig.mk
no changes added to commit (use "git add" and/or "git commit -a")
On branch cm-11.0
Changes not staged for commit:
	modified:   init.x3.rc
no changes added to commit (use "git add" and/or "git commit -a")
On branch cm-11.0
Changes not staged for commit:
	modified:   cm.mk
no changes added to commit (use "git add" and/or "git commit -a")
On branch cm-11.0
Changes not staged for commit:
	modified:   init.x3.rc
no changes added to commit (use "git add" and/or "git commit -a")
On branch cm-11.0
Changes not staged for commit:
	modified:   init.x3.rc
no changes added to commit (use "git add" and/or "git commit -a")
Merge branch 'cm-11.0' of https://github.com/alfsamsung/android_device_lge_p880 into cm-11.0

Conflicts:
	init.x3.rc