63d7bd1b17
microblaze: Remove incorrect file path
...
Trivial.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2013-11-08 15:23:55 +01:00
99399545d6
microblaze: Fix bug with mmap2 syscall MB implementation
...
Fix mmap2 behaviour which incorrectly works with pgoff
not in 4k units.
Reported-by: Rich Felker <dalias@aerifal.cx>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2013-11-08 15:20:44 +01:00
176195e757
microblaze: Use predefined SYSCALL_DEFINE macro
...
Use standard syscall definition.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2013-11-08 15:20:39 +01:00
db2a7df034
microblaze: Remove deprecated IRQF_DISABLED
...
Removed IRQF_DISABLED as it's no-op and should be removed.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2013-11-08 15:18:30 +01:00
9a22a8f558
ALSA: hda/realtek - Add new codec ALC255/ALC3234 UAJ supported
...
New codec ALC255/ALC3234 support multifunction jacks.
It used for menual select the input device.
Signed-off-by: Kailang Yang <kailang@realtek.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-11-08 13:52:59 +01:00
885845d785
ALSA: hda - Apply MacBook fixups for CS4208 correctly
...
The commit [8fe7b65ab465: ALSA: hda - Apply GPIO setup for MacBooks
with CS4208] added a fixup entry matching with the vendor id 0x106b.
This broke the fixups for previous MBA6,1 and 6,2, since the PCI SSID
vendor id matches before evaluating the codec SSIDs.
We had a similar issue on Mac with Sigmatel codecs, and solve this
problem again similarly, by introducing a skeleton entry matching with
the all MacBooks, then remap to the right one.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=64401
Fixes: 8fe7b65ab4
2013-11-08 13:50:56 +01:00
51387306b5
metag: off by one in setup_bootmem_node()
...
If "nid == MAX_NUMNODES" then we write beyond the end of the node_data[]
array.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: James Hogan <james.hogan@imgtec.com>
2013-11-08 11:23:00 +00:00
dd212bd5bb
Merge remote-tracking branch 'asoc/topic/wm8996' into asoc-next
2013-11-08 10:43:43 +00:00
22b468a06e
Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-next
2013-11-08 10:43:42 +00:00
552b747564
Merge remote-tracking branch 'asoc/topic/wm8400' into asoc-next
2013-11-08 10:43:42 +00:00
a941145d2b
Merge remote-tracking branch 'asoc/topic/wm0010' into asoc-next
2013-11-08 10:43:41 +00:00
108145a606
Merge remote-tracking branch 'asoc/topic/warn' into asoc-next
2013-11-08 10:43:41 +00:00
022aa51e3f
Merge remote-tracking branch 'asoc/topic/twl6040' into asoc-next
2013-11-08 10:43:40 +00:00
88cb5111e8
Merge remote-tracking branch 'asoc/topic/twl4030' into asoc-next
2013-11-08 10:43:40 +00:00
86408059df
Merge remote-tracking branch 'asoc/topic/tpa6130a2' into asoc-next
2013-11-08 10:43:40 +00:00
b24a63d5ef
Merge remote-tracking branch 'asoc/topic/tlv320aic3x' into asoc-next
2013-11-08 10:43:39 +00:00
32b7fdfefa
Merge remote-tracking branch 'asoc/topic/tlv320aic32x4' into asoc-next
2013-11-08 10:43:39 +00:00
abdf150ade
Merge remote-tracking branch 'asoc/topic/tlv320aic26' into asoc-next
2013-11-08 10:43:38 +00:00
e029530075
Merge remote-tracking branch 'asoc/topic/tlv320aic23' into asoc-next
2013-11-08 10:43:38 +00:00
d4af6be4f8
Merge remote-tracking branch 'asoc/topic/tegra' into asoc-next
2013-11-08 10:43:37 +00:00
be529a5b7f
Merge remote-tracking branch 'asoc/topic/tas5086' into asoc-next
2013-11-08 10:43:37 +00:00
6c61bbf0e8
Merge remote-tracking branch 'asoc/topic/spear' into asoc-next
2013-11-08 10:43:36 +00:00
bd6d35a370
Merge remote-tracking branch 'asoc/topic/sn95031' into asoc-next
2013-11-08 10:43:36 +00:00
8bffb007a5
Merge remote-tracking branch 'asoc/topic/simple' into asoc-next
2013-11-08 10:43:35 +00:00
6a2972b363
Merge remote-tracking branch 'asoc/topic/si476x' into asoc-next
2013-11-08 10:43:35 +00:00
87373ad1f3
Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next
2013-11-08 10:43:35 +00:00
457eb9016b
Merge remote-tracking branch 'asoc/topic/rt5640' into asoc-next
2013-11-08 10:43:34 +00:00
9686e4b2a8
Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next
2013-11-08 10:43:34 +00:00
469cb9286e
Merge remote-tracking branch 'asoc/topic/pxa' into asoc-next
2013-11-08 10:43:33 +00:00
df8aabe442
Merge remote-tracking branch 'asoc/topic/pcm1792a' into asoc-next
2013-11-08 10:43:33 +00:00
97df0a0538
Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-next
2013-11-08 10:43:32 +00:00
5ac452772f
Merge remote-tracking branch 'asoc/topic/mxs' into asoc-next
2013-11-08 10:43:32 +00:00
672922e975
Merge remote-tracking branch 'asoc/topic/ml26124' into asoc-next
2013-11-08 10:43:31 +00:00
efdf09add9
Merge remote-tracking branch 'asoc/topic/mc13783' into asoc-next
2013-11-08 10:43:31 +00:00
c462b1d8bb
Merge remote-tracking branch 'asoc/topic/max9850' into asoc-next
2013-11-08 10:43:31 +00:00
b8a77af201
Merge remote-tracking branch 'asoc/topic/max98095' into asoc-next
2013-11-08 10:43:30 +00:00
5f343663a2
Merge remote-tracking branch 'asoc/topic/max98088' into asoc-next
2013-11-08 10:43:30 +00:00
ca2b2252fc
Merge remote-tracking branch 'asoc/topic/kirkwood' into asoc-next
2013-11-08 10:43:29 +00:00
ec7118e391
Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next
2013-11-08 10:43:29 +00:00
3352b80075
Merge remote-tracking branch 'asoc/topic/ep93xx' into asoc-next
2013-11-08 10:43:28 +00:00
6157e734de
Merge remote-tracking branch 'asoc/topic/doc' into asoc-next
2013-11-08 10:43:28 +00:00
99a0ea2d5b
Merge remote-tracking branch 'asoc/topic/devm' into asoc-next
2013-11-08 10:43:27 +00:00
ac97d4e00a
Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next
2013-11-08 10:43:27 +00:00
1d697db0ab
Merge remote-tracking branch 'asoc/topic/cs42l73' into asoc-next
2013-11-08 10:43:26 +00:00
2029ef2500
Merge remote-tracking branch 'asoc/topic/cs42l52' into asoc-next
2013-11-08 10:43:26 +00:00
491f06b160
Merge remote-tracking branch 'asoc/topic/cs4271' into asoc-next
2013-11-08 10:43:25 +00:00
477ce17dec
Merge remote-tracking branch 'asoc/topic/cq93vc' into asoc-next
2013-11-08 10:43:25 +00:00
c6016bdeab
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
2013-11-08 10:43:25 +00:00
d20b09f0c5
Merge remote-tracking branch 'asoc/topic/component' into asoc-next
2013-11-08 10:43:24 +00:00
2fc175c4a3
Merge remote-tracking branch 'asoc/topic/bclk' into asoc-next
2013-11-08 10:43:24 +00:00
Michal Simek
Kailang Yang
Takashi Iwai
Dan Carpenter
Mark Brown