Linus Torvalds 0b981cb94b Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip ... Pull scheduler changes from Ingo Molnar: "Continued quest to clean up and enhance the cputime code by Frederic Weisbecker, in preparation for future tickless kernel features. Other than that, smallish changes." Fix up trivial conflicts due to additions next to each other in arch/{x86/}Kconfig * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (24 commits) cputime: Make finegrained irqtime accounting generally available cputime: Gather time/stats accounting config options into a single menu ia64: Reuse system and user vtime accounting functions on task switch ia64: Consolidate user vtime accounting vtime: Consolidate system/idle context detection cputime: Use a proper subsystem naming for vtime related APIs sched: cpu_power: enable ARCH_POWER sched/nohz: Clean up select_nohz_load_balancer() sched: Fix load avg vs. cpu-hotplug sched: Remove __ARCH_WANT_INTERRUPTS_ON_CTXSW sched: Fix nohz_idle_balance() sched: Remove useless code in yield_to() sched: Add time unit suffix to sched sysctl knobs sched/debug: Limit sd->*_idx range on sysctl sched: Remove AFFINE_WAKEUPS feature flag s390: Remove leftover account_tick_vtime() header cputime: Consolidate vtime handling on context switch sched: Move cputime code to its own file cputime: Generalize CONFIG_VIRT_CPU_ACCOUNTING tile: Remove SD_PREFER_LOCAL leftover ...		2012-10-01 10:43:39 -07:00
..
ABI	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2012-10-01 09:13:10 -07:00
accounting	doc: getdelays.c: remember to close() socket on error in create_nl_socket()	2012-09-01 09:58:59 -07:00
acpi
aoe
arm	[media] Documentation: Add newline at end-of-file to files lacking one	2012-07-30 20:37:01 -03:00
auxdisplay
backlight
blackfin
block	Documentation: update tunable options in block/cfq-iosched.txt	2012-08-09 15:28:05 +02:00
blockdev
cdrom
cgroups	mm/memcg: complete documentation for tcp memcg files	2012-07-31 18:42:43 -07:00
connector	connector: Move cn_test.c away from NLMSG_PUT().	2012-06-26 21:19:02 -07:00
console
cpu-freq
cpuidle
cris
crypto
development-process
device-mapper	Merge branch 'for-next' of git://neil.brown.name/md	2012-08-01 09:02:01 -07:00
devicetree	Merge remote-tracking branches 'regulator/topic/core', 'regulator/topic/bypass', 'regulator/topic/tol', 'regulator/topic/drivers' and 'regulator/topic/tps6586x' into regulator-next	2012-09-28 14:45:07 +01:00
DocBook	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-08-21 16:54:38 -07:00
driver-model
dvb	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-07-30 19:03:41 -07:00
early-userspace
EDID
extcon
fault-injection	fault-injection: add tool to run command with failslab or fail_page_alloc	2012-07-30 17:25:22 -07:00
fb
filesystems	Documentation: update mount option in filesystem/vfat.txt	2012-08-21 16:45:02 -07:00
firmware_class
frv
hid	HID: uhid: add documentation	2012-06-18 13:42:03 +02:00
hwmon	hwmon: Honeywell Humidicon HIH-6130/HIH-6131 humidity and temperature sensor driver	2012-07-21 21:48:44 -07:00
i2c	i2c-i801: Add Device IDs for Intel Lynx Point-LP PCH	2012-09-10 10:14:02 +02:00
i2o
ia64	doc: aliasing-test: close fd on write error	2012-09-01 09:57:10 -07:00
ide
infiniband
input	Input: add driver for FT5x06 based EDT displays	2012-07-24 23:55:03 -07:00
ioctl	vfio: VFIO core	2012-07-31 08:16:22 -06:00
isdn
ja_JP
kbuild
kdump	kexec: update URL of kexec homepage	2012-07-18 18:35:57 -07:00
ko_KR
laptops	Documentation: fix the VM knobs descritpion WRT pdflush	2012-08-04 12:15:09 +04:00
leds	LEDS: add BlinkM RGB LED driver, documentation and update MAINTAINERS	2012-07-24 16:00:51 +08:00
m68k
make
memory-devices
mips
misc-devices
mmc
mn10300
mtd
namespaces
netlabel
networking	netconsole.txt: revision of examples for the receiver of kernel messages	2012-08-14 14:33:33 -07:00
nfc	NFC: Error management documentation	2012-07-09 16:42:11 -04:00
parisc
PCI
pcmcia
power	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-10-01 09:06:36 -07:00
powerpc
pps
prctl	security: Minor improvements to no_new_privs documentation	2012-07-08 00:25:48 +10:00
pti
ptp
rapidio
RCU	Merge branches 'bigrt.2012.09.23a', 'doctorture.2012.09.23a', 'fixes.2012.09.23a', 'hotplug.2012.09.23a' and 'idlechop.2012.09.23a' into HEAD	2012-09-24 20:02:22 -07:00
s390
scheduler	sched: Remove __ARCH_WANT_INTERRUPTS_ON_CTXSW	2012-09-13 16:52:04 +02:00
scsi
security	Yama: higher restrictions should block PTRACE_TRACEME	2012-08-10 19:58:07 +10:00
serial
sh
sound	Sound fixes for 3.6-rc1	2012-08-01 10:42:26 -07:00
spi
sysctl	Documentation: fix the VM knobs descritpion WRT pdflush	2012-08-04 12:15:09 +04:00
target
telephony
thermal	Thermal: Documentation update	2012-07-24 23:20:40 -04:00
timers
trace	doc: fix old config name of kprobetrace	2012-09-27 12:11:29 +02:00
usb	usb: gadget: mass_storage: add documentation	2012-06-15 14:32:30 +03:00
vDSO
video4linux	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-07-31 18:47:44 -07:00
virtual	KVM updates for the 3.6 merge window	2012-07-24 12:01:20 -07:00
vm	hugetlb: update hugetlbpage.txt	2012-08-21 16:45:03 -07:00
w1	1-Wire: Add support for the maxim ds1825 temperature sensor	2012-08-16 12:33:59 -07:00
watchdog	watchdog: fix watchdog-test.c build warning	2012-08-29 17:12:58 +02:00
wimax
x86	Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-07-26 13:13:25 -07:00
zh_CN
.gitignore
00-INDEX
applying-patches.txt
atomic_ops.txt
bad_memory.txt
basic_profiling.txt
binfmt_misc.txt
braille-console.txt
bt8xxgpio.txt
btmrvl.txt
BUG-HUNTING
bus-virt-phys-mapping.txt
cachetlb.txt
Changes
circular-buffers.txt
clk.txt
coccinelle.txt
CodingStyle
cpu-hotplug.txt
cpu-load.txt
cputopology.txt
crc32.txt
dcdbas.txt
debugging-modules.txt
debugging-via-ohci1394.txt
dell_rbu.txt
devices.txt
digsig.txt
DMA-API-HOWTO.txt
DMA-API.txt
DMA-attributes.txt	common: DMA-mapping: add DMA_ATTR_SKIP_CPU_SYNC attribute	2012-07-30 12:25:47 +02:00
dma-buf-sharing.txt
DMA-ISA-LPC.txt
dmaengine.txt
dontdiff	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-10-01 09:06:36 -07:00
dynamic-debug-howto.txt
edac.txt	Merge branch 'devel'	2012-07-29 21:11:05 -03:00
eisa.txt
email-clients.txt
feature-removal-schedule.txt	ARM: at91/feature-removal-schedule: delay at91_mci removal	2012-08-27 09:59:36 +02:00
flexible-arrays.txt
futex-requeue-pi.txt
gcov.txt
gpio.txt
highuid.txt
HOWTO
hw_random.txt
hwspinlock.txt
init.txt
initrd.txt
Intel-IOMMU.txt
intel_txt.txt
io-mapping.txt
io_ordering.txt
iostats.txt
IPMI.txt
IRQ-affinity.txt
IRQ-domain.txt	irq_domain: Standardise legacy/linear domain selection	2012-07-11 14:59:17 +01:00
IRQ.txt
irqflags-tracing.txt
isapnp.txt
java.txt
kernel-doc-nano-HOWTO.txt
kernel-docs.txt
kernel-parameters.txt	rcu: Control grace-period duration from sysfs	2012-09-23 07:41:54 -07:00
kmemcheck.txt
kmemleak.txt
kobject.txt
kprobes.txt
kref.txt
ldm.txt
local_ops.txt
lockdep-design.txt
lockstat.txt
lockup-watchdogs.txt
logo.gif
logo.txt
magic-number.txt
Makefile
ManagementStyle	Documentation: ManagementStyle: fixed typo	2012-06-28 12:03:15 +02:00
md.txt
media-framework.txt
memory-barriers.txt
memory-hotplug.txt
memory.txt
mono.txt
mutex-design.txt
nommu-mmap.txt
numastat.txt
oops-tracing.txt
padata.txt
parport-lowlevel.txt
parport.txt
pi-futex.txt
pinctrl.txt	Documentation/pinctrl.txt: Fix some misspelled macros	2012-08-17 11:09:58 +02:00
pnp.txt
preempt-locking.txt
printk-formats.txt	vsprintf: add support of '%*ph[CDN]'	2012-07-30 17:25:14 -07:00
prio_tree.txt
pwm.txt	pwm: Add table-based lookup for static mappings	2012-06-15 12:56:53 +02:00
ramoops.txt	pstore/ram: Add ftrace messages handling	2012-07-17 10:14:17 -07:00
rbtree.txt
remoteproc.txt	remoteproc: adopt the driver core's alloc/add/del/put naming	2012-07-06 00:53:27 +03:00
rfkill.txt
robust-futex-ABI.txt
robust-futexes.txt
rpmsg.txt
rt-mutex-design.txt
rt-mutex.txt
rtc.txt
SAK.txt
SecurityBugs
serial-console.txt
sgi-ioc4.txt
sgi-visws.txt
SM501.txt
sparse.txt
spinlocks.txt
stable_api_nonsense.txt
stable_kernel_rules.txt	stable: Allow merging of backports for serious user-visible performance issues	2012-06-25 12:11:58 -07:00
static-keys.txt
SubmitChecklist
SubmittingDrivers
SubmittingPatches
svga.txt
sysfs-rules.txt
sysrq.txt
unaligned-memory-access.txt
unicode.txt
unshare.txt
vfio.txt	vfio: Trivial Documentation correction	2012-09-21 10:48:03 -06:00
VGA-softcursor.txt
vgaarbiter.txt
video-output.txt
vme_api.txt
volatile-considered-harmful.txt
workqueue.txt	workqueue: reimplement WQ_HIGHPRI using a separate worker_pool	2012-07-13 22:24:45 -07:00
xz.txt
zorro.txt