summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2012-08-03 22:41:33 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-08-03 22:41:33 -0300
commitf9cd49033b349b8be3bb1f01b39eed837853d880 (patch)
tree7f10a70e420f83cce2709e67ff993270276f0277 /include/linux
parent2f2da1e2995c9362babd7da3cc9d340be184ea73 (diff)
parent0d7614f09c1ebdbaa1599a5aba7593f147bf96ee (diff)
downloadlinux-f9cd49033b349b8be3bb1f01b39eed837853d880.tar.gz
linux-f9cd49033b349b8be3bb1f01b39eed837853d880.tar.bz2
linux-f9cd49033b349b8be3bb1f01b39eed837853d880.zip
Merge tag 'v3.6-rc1' into staging/for_v3.6
Linux 3.6-rc1 * tag 'v3.6-rc1': (18733 commits) Linux 3.6-rc1 mm: remove node_start_pfn checking in new WARN_ON for now ARM: mmp: add missing irqs.h arm: mvebu: fix typo in .dtsi comment for Armada XP SoCs ARM: PRIMA2: delete redundant codes to restore LATCHED when timer resumes libceph: fix crypto key null deref, memory leak ceph: simplify+fix atomic_open sh: explicitly include sh_dma.h in setup-sh7722.c um: Add arch/x86/um to MAINTAINERS um: pass siginfo to guest process um: fix ubd_file_size for read-only files md/dm-raid: DM_RAID should select MD_RAID10 md/raid1: submit IO from originating thread instead of md thread. raid5: raid5d handle stripe in batch way raid5: make_request use batch stripe release um: pull interrupt_end() into userspace() um: split syscall_trace(), pass pt_regs to it um: switch UPT_SET_RETURN_VALUE and regs_return_value to pt_regs MIPS: Loongson 2: Sort out clock managment. locks: remove unused lm_release_private ...
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/Kbuild10
-rw-r--r--include/linux/ac97_codec.h362
-rw-r--r--include/linux/acpi.h50
-rw-r--r--include/linux/aio.h37
-rw-r--r--include/linux/alarmtimer.h3
-rw-r--r--include/linux/amba/bus.h8
-rw-r--r--include/linux/amba/pl022.h9
-rw-r--r--include/linux/amba/pl08x.h153
-rw-r--r--include/linux/apple_bl.h2
-rw-r--r--include/linux/async.h36
-rw-r--r--include/linux/ata.h1
-rw-r--r--include/linux/atmlec.h7
-rw-r--r--include/linux/audit.h12
-rw-r--r--include/linux/backing-dev.h7
-rw-r--r--include/linux/basic_mmio_gpio.h6
-rw-r--r--include/linux/bcma/bcma.h47
-rw-r--r--include/linux/bcma/bcma_driver_chipcommon.h88
-rw-r--r--include/linux/bcma/bcma_driver_gmac_cmn.h100
-rw-r--r--include/linux/bcma/bcma_driver_pci.h11
-rw-r--r--include/linux/bio.h8
-rw-r--r--include/linux/blk_types.h12
-rw-r--r--include/linux/blkdev.h85
-rw-r--r--include/linux/blkpg.h1
-rw-r--r--include/linux/bootmem.h11
-rw-r--r--include/linux/bsg-lib.h1
-rw-r--r--include/linux/bug.h7
-rw-r--r--include/linux/can.h70
-rw-r--r--include/linux/can/core.h4
-rw-r--r--include/linux/can/dev.h35
-rw-r--r--include/linux/can/error.h4
-rw-r--r--include/linux/can/raw.h3
-rw-r--r--include/linux/capability.h7
-rw-r--r--include/linux/ceph/auth.h12
-rw-r--r--include/linux/ceph/ceph_features.h27
-rw-r--r--include/linux/ceph/ceph_fs.h18
-rw-r--r--include/linux/ceph/decode.h58
-rw-r--r--include/linux/ceph/libceph.h10
-rw-r--r--include/linux/ceph/messenger.h78
-rw-r--r--include/linux/ceph/mon_client.h2
-rw-r--r--include/linux/ceph/msgpool.h3
-rw-r--r--include/linux/ceph/osd_client.h11
-rw-r--r--include/linux/ceph/osdmap.h2
-rw-r--r--include/linux/cgroup.h94
-rw-r--r--include/linux/cgroup_subsys.h8
-rw-r--r--include/linux/clk-private.h117
-rw-r--r--include/linux/clk-provider.h149
-rw-r--r--include/linux/clk.h218
-rw-r--r--include/linux/clkdev.h3
-rw-r--r--include/linux/clockchips.h1
-rw-r--r--include/linux/compaction.h4
-rw-r--r--include/linux/compat.h7
-rw-r--r--include/linux/compiler-gcc.h6
-rw-r--r--include/linux/cpu.h8
-rw-r--r--include/linux/cpu_rmap.h4
-rw-r--r--include/linux/cpuidle.h31
-rw-r--r--include/linux/cpumask.h15
-rw-r--r--include/linux/cpuset.h4
-rw-r--r--include/linux/cred.h43
-rw-r--r--include/linux/crush/crush.h26
-rw-r--r--include/linux/crush/mapper.h7
-rw-r--r--include/linux/cs5535.h1
-rw-r--r--include/linux/dcache.h25
-rw-r--r--include/linux/dcbnl.h12
-rw-r--r--include/linux/dccp.h2
-rw-r--r--include/linux/debugfs.h11
-rw-r--r--include/linux/device-mapper.h29
-rw-r--r--include/linux/device.h47
-rw-r--r--include/linux/dlm.h1
-rw-r--r--include/linux/dm-ioctl.h6
-rw-r--r--include/linux/dma-attrs.h2
-rw-r--r--include/linux/dma-buf.h33
-rw-r--r--include/linux/dma-contiguous.h110
-rw-r--r--include/linux/dma-mapping.h3
-rw-r--r--include/linux/dmaengine.h28
-rw-r--r--include/linux/dmar.h85
-rw-r--r--include/linux/drbd.h6
-rw-r--r--include/linux/drbd_limits.h7
-rw-r--r--include/linux/drbd_nl.h5
-rw-r--r--include/linux/dw_apb_timer.h1
-rw-r--r--include/linux/dynamic_debug.h22
-rw-r--r--include/linux/edac.h358
-rw-r--r--include/linux/efi.h2
-rw-r--r--include/linux/elevator.h8
-rw-r--r--include/linux/errno.h1
-rw-r--r--include/linux/etherdevice.h85
-rw-r--r--include/linux/ethtool.h112
-rw-r--r--include/linux/eventfd.h2
-rw-r--r--include/linux/eventpoll.h12
-rw-r--r--include/linux/exportfs.h4
-rw-r--r--include/linux/extcon.h324
-rw-r--r--include/linux/extcon/extcon_gpio.h52
-rw-r--r--include/linux/fb.h5
-rw-r--r--include/linux/file.h3
-rw-r--r--include/linux/filter.h19
-rw-r--r--include/linux/firewire.h21
-rw-r--r--include/linux/flex_proportions.h101
-rw-r--r--include/linux/frontswap.h127
-rw-r--r--include/linux/fs.h291
-rw-r--r--include/linux/fsl/mxs-dma.h12
-rw-r--r--include/linux/fsl_devices.h9
-rw-r--r--include/linux/fsnotify_backend.h2
-rw-r--r--include/linux/ftrace.h19
-rw-r--r--include/linux/ftrace_event.h7
-rw-r--r--include/linux/fuse.h14
-rw-r--r--include/linux/gameport.h13
-rw-r--r--include/linux/generic_serial.h64
-rw-r--r--include/linux/genetlink.h5
-rw-r--r--include/linux/genhd.h64
-rw-r--r--include/linux/gfp.h25
-rw-r--r--include/linux/gfs2_ondisk.h14
-rw-r--r--include/linux/gpio.h59
-rw-r--r--include/linux/hid.h37
-rw-r--r--include/linux/hidraw.h4
-rw-r--r--include/linux/highmem.h48
-rw-r--r--include/linux/hrtimer.h10
-rw-r--r--include/linux/huge_mm.h2
-rw-r--r--include/linux/hugetlb.h58
-rw-r--r--include/linux/hugetlb_cgroup.h126
-rw-r--r--include/linux/hyperv.h31
-rw-r--r--include/linux/i2c-mux-gpio.h (renamed from include/linux/gpio-i2cmux.h)14
-rw-r--r--include/linux/i2c-mux-pinctrl.h41
-rw-r--r--include/linux/i2c-mux.h3
-rw-r--r--include/linux/i2c-ocores.h3
-rw-r--r--include/linux/i2c-pnx.h10
-rw-r--r--include/linux/i2c.h9
-rw-r--r--include/linux/i2c/adp5588.h1
-rw-r--r--include/linux/i2c/mms114.h24
-rw-r--r--include/linux/i2c/pca953x.h2
-rw-r--r--include/linux/i2c/twl.h16
-rw-r--r--include/linux/i2o-dev.h2
-rw-r--r--include/linux/ibmtr.h373
-rw-r--r--include/linux/ieee80211.h246
-rw-r--r--include/linux/if.h2
-rw-r--r--include/linux/if_arp.h1
-rw-r--r--include/linux/if_ec.h68
-rw-r--r--include/linux/if_ether.h3
-rw-r--r--include/linux/if_link.h7
-rw-r--r--