Randy Dunlap
7e3528c366
slab.h: remove duplicate kmalloc declaration and fix kernel-doc warnings
...
Fix kernel-doc warning for duplicate definition of 'kmalloc':
Documentation/DocBook/kernel-api.xml:9483: element refentry: validity error : ID API-kmalloc already defined
<refentry id="API-kmalloc">
Also combine the kernel-doc info from the 2 kmalloc definitions into one
block and remove the "see kcalloc" comment since kmalloc now contains the
@flags info.
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Acked-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-11-24 11:01:16 -08:00
..
acpi
ACPI / driver core: Store an ACPI device pointer in struct acpi_dev_node
2013-11-14 23:14:43 +01:00
asm-generic
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2013-11-23 16:18:25 -08:00
clocksource
crypto
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2013-11-23 16:18:25 -08:00
drm
Merge branch 'ttm-fixes-3.13' of git://people.freedesktop.org/~thomash/linux into drm-fixes
2013-11-21 18:46:56 +10:00
dt-bindings
For the 3.13 merge window we have a couple of new drivers for the AMS
2013-11-15 16:37:40 -08:00
keys
kvm
linux
slab.h: remove duplicate kmalloc declaration and fix kernel-doc warnings
2013-11-24 11:01:16 -08:00
math-emu
media
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2013-11-18 15:50:07 -08:00
memory
misc
net
genetlink: fix genl_set_err() group ID
2013-11-21 13:09:43 -05:00
pcmcia
ras
rdma
Merge branches 'cma', 'cxgb4', 'flowsteer', 'ipoib', 'misc', 'mlx4', 'mlx5', 'nes', 'ocrdma', 'qib' and 'srp' into for-next
2013-11-17 08:22:19 -08:00
rxrpc
scsi
Main batch of InfiniBand/RDMA changes for 3.13:
2013-11-18 15:36:04 -08:00
sound
Merge remote-tracking branch 'asoc/topic/twl4030' into asoc-next
2013-11-08 10:43:40 +00:00
target
target_core_alua: Store supported ALUA states
2013-11-20 11:26:37 -08:00
trace
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
2013-11-22 08:38:55 -08:00
uapi
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
2013-11-22 10:56:11 -08:00
video
fbdev changes for 3.13
2013-11-14 14:44:20 +09:00
xen
Features:
2013-11-15 13:34:37 +09:00
Kbuild