leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28c42c2830
linux/sound/soc/au1x
History
Linus Torvalds 4964e0664c Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (119 commits)
  MIPS: Delete unused function add_temporary_entry.
  MIPS: Set default pci cache line size.
  MIPS: Flush huge TLB
  MIPS: Octeon: Remove SYS_SUPPORTS_HIGHMEM.
  MIPS: Octeon: Add support for OCTEON II PCIe
  MIPS: Octeon: Update PCI Latency timer and enable more error reporting.
  MIPS: Alchemy: Update cpu-feature-overrides
  MIPS: Alchemy: db1200: Improve PB1200 detection.
  MIPS: Alchemy: merge Au1000 and Au1300-style IRQ controller code.
  MIPS: Alchemy: chain IRQ controllers to MIPS IRQ controller
  MIPS: Alchemy: irq: register pm at irq init time
  MIPS: Alchemy: Touchscreen support on DB1100
  MIPS: Alchemy: Hook up IrDA on DB1000/DB1100
  net/irda: convert au1k_ir to platform driver.
  MIPS: Alchemy: remove unused board headers
  MTD: nand: make au1550nd.c a platform_driver
  MIPS: Netlogic: Mark Netlogic chips as SMT capable
  MIPS: Netlogic: Add support for XLP 3XX cores
  MIPS: Netlogic: Merge some of XLR/XLP wakup code
  MIPS: Netlogic: Add default XLP config.
  ...

Fix up trivial conflicts in arch/mips/kernel/{perf_event_mipsxx.c,
traps.c} and drivers/tty/serial/Makefile
2012-01-14 13:05:21 -08:00
..
ac97c.c ASoC: ac97c.c: use devm_ functions 2012-01-02 13:08:28 +00:00
db1000.c ASoC: au1x: Add .owner to struct snd_soc_card 2011-12-23 11:16:29 +00:00
db1200.c Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2012-01-14 13:05:21 -08:00
dbdma2.c ASoC: dbdma2.c: use devm_ functions 2012-01-02 13:08:23 +00:00
dma.c ASoC: dma.c: use devm_ functions 2012-01-02 13:08:18 +00:00
i2sc.c ASoC: i2sc.c: use devm_ functions 2012-01-02 13:08:13 +00:00
Kconfig MIPS: Alchemy: Improved DB1550 support, with audio and serial busses. 2011-12-07 22:02:06 +00:00
Makefile ASoC: Add a DB1x00 AC97 machine driver 2011-07-27 19:10:48 +01:00
psc-ac97.c ASoC: psc-ac97.c: use devm_ functions 2012-01-02 13:08:07 +00:00
psc-i2s.c ASoC: psc-i2s.c: use devm_ functions 2012-01-02 13:08:02 +00:00
psc.h ASoC: au1x: use substream stream info directly 2011-07-27 19:16:51 +01:00