| #
80da549e |
| 19-Nov-2012 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge tag 'v3.7-rc6' into asoc-wm2200
Linux 3.7-rc6
|
| #
24a118de |
| 19-Nov-2012 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge tag 'v3.7-rc6' into asoc-arizona
Linux 3.7-rc6
Conflicts:
sound/soc/codecs/wm5102.c
|
| #
67f4efdc |
| 17-Nov-2012 |
David S. Miller <davem@davemloft.net> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor line offset auto-merges.
Signed-off-by: David S. Miller <davem@davemloft.net>
|
| #
0c864d8b |
| 16-Nov-2012 |
Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
Merge 3.7-rc6 into usb-next.
This resolves a conflict with these files:
drivers/usb/early/ehci-dbgp.c
drivers/usb/host/ehci-ls1x.c
drivers/usb/host/ohci-xls.c
drivers/usb/musb/ux500.c
Signed-of
Merge 3.7-rc6 into usb-next.
This resolves a conflict with these files:
drivers/usb/early/ehci-dbgp.c
drivers/usb/host/ehci-ls1x.c
drivers/usb/host/ohci-xls.c
drivers/usb/musb/ux500.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
show more ...
|
| #
1e619a1b |
| 16-Nov-2012 |
Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
Merge 3.7-rc6 into tty-next
|
| #
acf1cf6a |
| 16-Nov-2012 |
Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
Merge 3.7-rc6 into staging-next
|
| #
98c4514f |
| 16-Nov-2012 |
Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
Merge 3.7-rc6 into char-misc-next
|
|
Revision tags: v3.7-rc6 |
|
| #
70c80dfd |
| 12-Nov-2012 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull menuconfig portability fix from Michal Marek:
"Here is a fix for v3.7 that makes menuconfig compile again
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull menuconfig portability fix from Michal Marek:
"Here is a fix for v3.7 that makes menuconfig compile again on systems
whose C library is lacking CIRCLEQ_* macros. I thought I sent it
earlier, but apparently I did not."
* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
menuconfig: Replace CIRCLEQ by list_head-style lists.
show more ...
|
|
Revision tags: v3.7-rc5, v3.7-rc4, v3.7-rc3 |
|
| #
bad9955d |
| 21-Oct-2012 |
Benjamin Poirier <bpoirier@suse.de> |
menuconfig: Replace CIRCLEQ by list_head-style lists.
sys/queue.h and CIRCLEQ in particular have proven to cause portability
problems (reported on Debian Sarge, Cygwin and FreeBSD)
Reported-by: Tet
menuconfig: Replace CIRCLEQ by list_head-style lists.
sys/queue.h and CIRCLEQ in particular have proven to cause portability
problems (reported on Debian Sarge, Cygwin and FreeBSD)
Reported-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Tested-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Tested-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Signed-off-by: Benjamin Poirier <bpoirier@suse.de>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Michal Marek <mmarek@suse.cz>
show more ...
|