#
d7fc02c7 |
| 08-Dec-2009 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1815 commits) mac80211: fix reorder buffer release iwm
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1815 commits) mac80211: fix reorder buffer release iwmc3200wifi: Enable wimax core through module parameter iwmc3200wifi: Add wifi-wimax coexistence mode as a module parameter iwmc3200wifi: Coex table command does not expect a response iwmc3200wifi: Update wiwi priority table iwlwifi: driver version track kernel version iwlwifi: indicate uCode type when fail dump error/event log iwl3945: remove duplicated event logging code b43: fix two warnings ipw2100: fix rebooting hang with driver loaded cfg80211: indent regulatory messages with spaces iwmc3200wifi: fix NULL pointer dereference in pmkid update mac80211: Fix TX status reporting for injected data frames ath9k: enable 2GHz band only if the device supports it airo: Fix integer overflow warning rt2x00: Fix padding bug on L2PAD devices. WE: Fix set events not propagated b43legacy: avoid PPC fault during resume b43: avoid PPC fault during resume tcp: fix a timewait refcnt race ...
Fix up conflicts due to sysctl cleanups (dead sysctl_check code and CTL_UNNUMBERED removed) in kernel/sysctl_check.c net/ipv4/sysctl_net_ipv4.c net/ipv6/addrconf.c net/sctp/sysctl.c
show more ...
|
Revision tags: v2.6.32 |
|
#
4ba3eb03 |
| 25-Nov-2009 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
|
#
e33761e6 |
| 23-Nov-2009 |
Michael Buesch <mb@bu3sch.de> |
ssb: Fix range check in sprom write
The range check in the sprom image parser hex2sprom() is broken. One sprom word is 4 hex characters. This fixes the check and also adds much better sanity checks
ssb: Fix range check in sprom write
The range check in the sprom image parser hex2sprom() is broken. One sprom word is 4 hex characters. This fixes the check and also adds much better sanity checks to the code. We better make sure the image is OK by doing some sanity checks to avoid bricking the device by accident.
Signed-off-by: Michael Buesch <mb@bu3sch.de> Cc: stable@kernel.org Signed-off-by: John W. Linville <linville@tuxdriver.com>
show more ...
|
#
3ba6018a |
| 23-Nov-2009 |
Michael Buesch <mb@bu3sch.de> |
ssb: Fix SPROM writing
The SPROM writing routines were broken since we rewrote the suspend handling on wireless devices, because SPROM writing depended on suspend.
This patch changes it and freezes
ssb: Fix SPROM writing
The SPROM writing routines were broken since we rewrote the suspend handling on wireless devices, because SPROM writing depended on suspend.
This patch changes it and freezes devices with the driver remove(), probe() callbacks instead. This also simplifies the whole logics a lot.
Signed-off-by: Michael Buesch <mb@bu3sch.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
show more ...
|
Revision tags: v2.6.32-rc8, v2.6.32-rc7, v2.6.32-rc6, v2.6.32-rc5, v2.6.32-rc4, v2.6.32-rc3, v2.6.32-rc1, v2.6.32-rc2, v2.6.31, v2.6.31-rc9, v2.6.31-rc8, v2.6.31-rc7, v2.6.31-rc6, v2.6.31-rc5, v2.6.31-rc4, v2.6.31-rc3, v2.6.31-rc2, v2.6.31-rc1, v2.6.30, v2.6.30-rc8, v2.6.30-rc7, v2.6.30-rc6 |
|
#
d585a021 |
| 09-May-2009 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge commit 'v2.6.30-rc5' into next
|
Revision tags: v2.6.30-rc5 |
|
#
3a20ac2c |
| 04-May-2009 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'fix/pcm-jiffies-check' into fix/asoc
|
Revision tags: v2.6.30-rc4, v2.6.30-rc3 |
|
#
8ecee462 |
| 21-Apr-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/mm
Merge reason: refresh the topic: there's been 290 non-merges commits upstream to arch/x86 alone.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
Revision tags: v2.6.30-rc2 |
|
#
6967963d |
| 14-Apr-2009 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge branch 'for-2.6.30' into for-2.6.31
|
#
5af8c4e0 |
| 08-Apr-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.30-rc1' into sched/urgent
Merge reason: update to latest upstream to queue up fix
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
Revision tags: v2.6.30-rc1 |
|
#
93776a8e |
| 07-Apr-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into tracing/core
Merge reason: update to upstream tracing facilities
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
2e8844e1 |
| 07-Apr-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into tracing/hw-branch-tracing
Merge reason: update to latest tracing and ptrace APIs
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
5e344378 |
| 07-Apr-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/softlockup
Conflicts: kernel/sysctl.c
|
#
f541ae32 |
| 06-Apr-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into perfcounters/core-v2
Merge reason: we have gathered quite a few conflicts, need to merge upstream
Conflicts: arch/powerpc/kernel/Makefile arch/x86/ia32/ia32entry.S arch
Merge branch 'linus' into perfcounters/core-v2
Merge reason: we have gathered quite a few conflicts, need to merge upstream
Conflicts: arch/powerpc/kernel/Makefile arch/x86/ia32/ia32entry.S arch/x86/include/asm/hardirq.h arch/x86/include/asm/unistd_32.h arch/x86/include/asm/unistd_64.h arch/x86/kernel/cpu/common.c arch/x86/kernel/irq.c arch/x86/kernel/syscall_table_32.S arch/x86/mm/iomap_32.c include/linux/sched.h kernel/Makefile
Signed-off-by: Ingo Molnar <mingo@elte.hu>
show more ...
|
#
9efe21cb |
| 06-Apr-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into irq/threaded
Conflicts: include/linux/irq.h kernel/irq/handle.c
|
#
478c6a43 |
| 05-Apr-2009 |
Len Brown <len.brown@intel.com> |
Merge branch 'linus' into release
Conflicts: arch/x86/kernel/cpu/cpufreq/longhaul.c
Signed-off-by: Len Brown <len.brown@intel.com>
|
#
83f2f0ed |
| 02-Apr-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/urgent
Merge needed to go past commit 7ca43e756 (mm: use debug_kmap_atomic) and fix it.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
7bee9463 |
| 31-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into locking-for-linus
Conflicts: lib/Kconfig.debug
|
#
930861c4 |
| 31-Mar-2009 |
Felix Blyakher <felixb@sgi.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
#
65fb0d23 |
| 30-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into cpumask-for-linus
Conflicts: arch/x86/kernel/cpu/common.c
|
#
9ff9a26b |
| 30-Mar-2009 |
Benjamin Herrenschmidt <benh@kernel.crashing.org> |
Merge commit 'origin/master' into next
Manual merge of: arch/powerpc/include/asm/elf.h drivers/i2c/busses/i2c-mpc.c
|
#
90f959bc |
| 29-Mar-2009 |
Dave Airlie <airlied@redhat.com> |
drm: merge Linux master into HEAD
Conflicts: drivers/gpu/drm/drm_info.c drivers/gpu/drm/drm_proc.c drivers/gpu/drm/i915/i915_gem_debugfs.c
|
#
38a6ed3e |
| 28-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/printk
|
#
d00ab2fd |
| 28-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/futexes
|
#
b0d44c0d |
| 28-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/iommu
Conflicts: arch/x86/Kconfig
|
#
3fab1910 |
| 28-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/core
|