History log of /linux/arch/um/include/asm/Kbuild (Results 526 – 550 of 565)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
# d5efccd5 16-Apr-2012 Mark Brown <broonie@opensource.wolfsonmicro.com>

ASoC: Merge tag 'v3.4-rc3' into for-3.5

Linux 3.4-rc3 contains a bunch of Tegra changes which are conflicting
annoyingly with the new development that's going on for Tegra so merge
it up to resolve

ASoC: Merge tag 'v3.4-rc3' into for-3.5

Linux 3.4-rc3 contains a bunch of Tegra changes which are conflicting
annoyingly with the new development that's going on for Tegra so merge
it up to resolve those conflicts.

Conflicts:
sound/soc/soc-core.c
sound/soc/tegra/tegra_i2s.c
sound/soc/tegra/tegra_spdif.c

show more ...


Revision tags: v3.4-rc3
# 6ac1ef48 14-Apr-2012 Ingo Molnar <mingo@kernel.org>

Merge branch 'perf/core' into perf/uprobes

Merge in latest upstream (and the latest perf development tree),
to prepare for tooling changes, and also to pick up v3.4 MM
changes that the uprobes code

Merge branch 'perf/core' into perf/uprobes

Merge in latest upstream (and the latest perf development tree),
to prepare for tooling changes, and also to pick up v3.4 MM
changes that the uprobes code needs to take care of.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

show more ...


# 3423166f 13-Apr-2012 David S. Miller <davem@davemloft.net>

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc


# a385ec4f 13-Apr-2012 Ingo Molnar <mingo@kernel.org>

Merge tag 'v3.4-rc2' into perf/core

Merge Linux 3.4-rc2: we were on v3.3, update the base.

Signed-off-by: Ingo Molnar <mingo@kernel.org>


# 011e3c63 13-Apr-2012 David S. Miller <davem@davemloft.net>

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net


# 586c7ecc 12-Apr-2012 Wey-Yi Guy <wey-yi.w.guy@intel.com>

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into wireless-next


# 80652480 12-Apr-2012 John W. Linville <linville@tuxdriver.com>

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless


# 33cd5cff 12-Apr-2012 Paul Mundt <lethal@linux-sh.org>

Merge branch 'common/clkfwk' into sh-latest


# 06eb4eaf 10-Apr-2012 David S. Miller <davem@davemloft.net>

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net


# 0682490d 10-Apr-2012 Linus Torvalds <torvalds@linux-foundation.org>

Merge branch 'for-3.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

Pull UML fixes from Richard Weinberger.

* 'for-3.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:

Merge branch 'for-3.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

Pull UML fixes from Richard Weinberger.

* 'for-3.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: uml_setup_stubs': warning: unused variable 'pages'
um: Use asm-generic/switch_to.h
um: Disintegrate asm/system.h
um: switch cow_user.h to htobe{32,64}/betoh{32,64}
um: several x86 hw-dependent crypto modules won't build on uml
um: fix linker script generation

show more ...


Revision tags: v3.4-rc2, v3.4-rc1
# 76b278ed 29-Mar-2012 Richard Weinberger <richard@nod.at>

um: Use asm-generic/switch_to.h

Signed-off-by: Richard Weinberger <richard@nod.at>


# a3a85a76 29-Mar-2012 Richard Weinberger <richard@nod.at>

um: Disintegrate asm/system.h

Signed-off-by: Richard Weinberger <richard@nod.at>
Reported-by: Toralf Förster <toralf.foerster@gmx.de>
CC: dhowells@redhat.com


# e75d6606 08-Apr-2012 Jiri Kosina <jkosina@suse.cz>

Merge branch 'master' into for-next

Merge with latest Linus' tree, as I have incoming patches
that fix code that is newer than current HEAD of for-next.

Conflicts:
drivers/net/ethernet/realtek/r81

Merge branch 'master' into for-next

Merge with latest Linus' tree, as I have incoming patches
that fix code that is newer than current HEAD of for-next.

Conflicts:
drivers/net/ethernet/realtek/r8169.c

show more ...


# c38f62b0 07-Apr-2012 Takashi Iwai <tiwai@suse.de>

Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: fixes for 3.4

A bunch of driver-specific fixes and one generic fix for the new support
for p

Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: fixes for 3.4

A bunch of driver-specific fixes and one generic fix for the new support
for platform DAPM contexts - we were picking the wrong default for the
idle_bias_off setting which was meaning we weren't actually achieving
any useful runtime PM on platform devices.

show more ...


# eeaab2d8 07-Apr-2012 Len Brown <len.brown@intel.com>

Merge branches 'idle-fix' and 'misc' into release


# 959d851c 01-Apr-2012 Tejun Heo <tj@kernel.org>

Merge branch 'for-3.5' of ../cgroup into block/for-3.5/core-merged

cgroup/for-3.5 contains the following changes which blk-cgroup needs
to proceed with the on-going cleanup.

* Dynamic addition and

Merge branch 'for-3.5' of ../cgroup into block/for-3.5/core-merged

cgroup/for-3.5 contains the following changes which blk-cgroup needs
to proceed with the on-going cleanup.

* Dynamic addition and removal of cftypes to make config/stat file
handling modular for policies.

* cgroup removal update to not wait for css references to drain to fix
blkcg removal hang caused by cfq caching cfqgs.

Pull in cgroup/for-3.5 into block/for-3.5/core. This causes the
following conflicts in block/blk-cgroup.c.

* 761b3ef50e "cgroup: remove cgroup_subsys argument from callbacks"
conflicts with blkiocg_pre_destroy() addition and blkiocg_attach()
removal. Resolved by removing @subsys from all subsys methods.

* 676f7c8f84 "cgroup: relocate cftype and cgroup_subsys definitions in
controllers" conflicts with ->pre_destroy() and ->attach() updates
and removal of modular config. Resolved by dropping forward
declarations of the methods and applying updates to the relocated
blkio_subsys.

* 4baf6e3325 "cgroup: convert all non-memcg controllers to the new
cftype interface" builds upon the previous item. Resolved by adding
->base_cftypes to the relocated blkio_subsys.

Signed-off-by: Tejun Heo <tj@kernel.org>

show more ...


# 6a4770e3 30-Mar-2012 Michal Simek <monstr@monstr.eu>

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next


# 186e54cb 30-Mar-2012 Ingo Molnar <mingo@kernel.org>

Merge branch 'linus' into x86/urgent

Merge reason: Needed for include file dependencies.

Signed-off-by: Ingo Molnar <mingo@elte.hu>


# 18af30e2 28-Mar-2012 Paul Mundt <lethal@linux-sh.org>

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest


# fa453a62 28-Mar-2012 Linus Torvalds <torvalds@linux-foundation.org>

Merge branch 'for-linus-3.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

Pull UML changes from Richard Weinberger:
"Mostly bug fixes and cleanups"

* 'for-linus-3.4-rc1' of git://gi

Merge branch 'for-linus-3.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

Pull UML changes from Richard Weinberger:
"Mostly bug fixes and cleanups"

* 'for-linus-3.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml: (35 commits)
um: Update defconfig
um: Switch to large mcmodel on x86_64
MTD: Relax dependencies
um: Wire CONFIG_GENERIC_IO up
um: Serve io_remap_pfn_range()
Introduce CONFIG_GENERIC_IO
um: allow SUBARCH=x86
um: most of the SUBARCH uses can be killed
um: deadlock in line_write_interrupt()
um: don't bother trying to rebuild CHECKFLAGS for USER_OBJS
um: use the right ifdef around exports in user_syms.c
um: a bunch of headers can be killed by using generic-y
um: ptrace-generic.h doesn't need user.h
um: kill HOST_TASK_PID
um: remove pointless include of asm/fixmap.h from asm/pgtable.h
um: asm-offsets.h might as well come from underlying arch...
um: merge processor_{32,64}.h a bit...
um: switch close_chan() to struct line
um: race fix: initialize delayed_work *before* registering IRQ
um: line->have_irq is never checked...
...

show more ...


Revision tags: v3.3, v3.3-rc7, v3.3-rc6, v3.3-rc5, v3.3-rc4, v3.3-rc3, v3.3-rc2
# d3985d9a 30-Jan-2012 Al Viro <viro@zeniv.linux.org.uk>

um: a bunch of headers can be killed by using generic-y

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>


Revision tags: v3.3-rc1
# da733563 09-Jan-2012 Dmitry Torokhov <dmitry.torokhov@gmail.com>

Merge branch 'next' into for-linus


Revision tags: v3.2
# 251f39fe 04-Jan-2012 Anton Vorontsov <cbouatmailru@gmail.com>

Merge branch 'power-supply-scope' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen


Revision tags: v3.2-rc7, v3.2-rc6
# 7e95e365 16-Dec-2011 Kalle Valo <kvalo@qca.qualcomm.com>

Merge remote branch 'wireless-next/master' into ath6kl-next

Conflicts:
drivers/net/wireless/ath/ath6kl/init.c


Revision tags: v3.2-rc5, v3.2-rc4
# e4da3fbf 01-Dec-2011 Luciano Coelho <coelho@ti.com>

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into wl12xx-next


1...<<212223